Updated with save and update object