Changed names of main functions