refactored theatre for more dryness.