Took out extra code