Took the functions out and put in calls