differentiate between double and max speed

closes #6466
closes #5693