Tune Setup and Setup Managment

Follow