Fixed add and delete (kinda)