Removed multiple functions with the same name, added first class
functions