Preparation for merge with BAnet