limiting the requests to the yaf server a bit, they are now only called when needed