Change find_by_id to find throughout the project