refactor Speed and Variant