renamed some functions, nothing important