some functions renamed