Continued migration to BS3