More changes on New Branch