fixed too many lines commented out