WIP fix and update