more work on CRM-12463