Repairs by Tatyana