remember speed
fix merge conflict