Added Delete function, update function has some bugs...