took out some unnecessary code