renamed some functions