Added switches to control the parts of the set that are used