updated soa for systems wp
fixed conflicts