Update to improve speed marginally