small changes for speed