SwC and plenty other changes made