took out unecessary code