Updated Setup script