completed migration to BS3