updated service stuff