Renamed file and added some functions