added new functions
changed name