Did a bit more with edit and update