master
Updated function names