added back lines 375 and 376