Renamed functions to be in line with Ashray's stuff