Further work on WIP proposal