Extensive changes in Branch_2