Added seancoyne's addition for returning q time