Update/delete done (kinda ugly for now)