Updated Setup and Version