SwC - main problem FIXED