changed trackwait for requests