Replaced the old implementation with the new one