minor changes, speed test