SwC - other changes