Changed back to simpler length/speed based interface