Working on update + edit