Added speed control and idle timer