more WIP changes