last update 24/5/2014 with finshed delete and undo of deleted