Tweaked changes to speed control pull request based on comments from mikeferguson