WIP update to latest style