added zero speed case... still to be tested