Improve on last commit a bit to not discriminate against slower PCs.