Changes for Branch 2 devlopment