First pass integration of service mode