renamed some functions
renamed functions