update for WIP v2 branch