Small changes for speed testing