SwC - further improvements