Replaced the function