Changed function name to be more similar to others.
Updated version