Final Setup

Setup Changes