Reduce set up times

One-Touch away from simplicity