SOAP IIA Improvement

Improved SOAP