updates to match local WIP version