Updated Setup file