More migration to BS3