Taking into account current velocity; maybe better?