Improve count/delete system, update client when done