Added random-start option