BA: Changes

Closes #601