change findBy back to original