Edit and Insert finally working