Further improved speed restoration