Added timer and random option