took out unnessesary code