good progress on a3
merged