[axof: 162]
[axof: 158] cleaning up some design