commiting all the final changes of pritam and mine