changed funtion names