Changing function names, update functionality which was broken, has now been fixed