lines 23 to 25 commented out