took out unnecessary code