More anderson changes

[LarrySC]

.....