(848---speed-up-checkbox) incorporated a bit of DBB's code cleanup