improved handling so tracking in tasks, ie non request cycles, is easier