updated scheduler functionality