Took out unecessary functions