fixed deal method, added remove method