First draft of update working