more BAO work(CRM-12463)