renamed some functions
renamed some functions