temporary commit for check policies and restructure of service calls
part of previous commit