commented lines 234 to 236