took out some extra stuffs