added remove and find