added remove, didnt test yet