Renamed some function
Renamed main function