if statements were partially commented out