Farazath first commit
Fara merged