Allowed the speed upgrade to self-update using dictionaries. Review later to make sure there isn't a more efficient way to do this