17.5 Setup

Modified Setup