added find and findAll