WIP: BA comments