Fixed update..finally