Renamed all function and properties with NEW