Row 1 and 8 complete by rashmi
This is the second commit by rashmi
Merged and conflicts solved by Rashmi