added find & findAll