Fixed update and merged