Duplicated walt's austerity with state graph & other internal changes.