Update to stop stat requests on every request