Refactoring a to maintain BC