added find and fremove