Added count and fixed find