added remove and auto add