Adding user selection of scale and time