updated scheduler and service