Changed function for consistency