Took out the commented if statements