Add changes 6,7,8
fix conflict