Took out functions that were not working