2 functions renamed