ac: first lot of iteration 2 changes