simplify for service a bit