adjustments to service behaviour