Bison WIP update