Renamed function name
Updated version