Farazath

Wajjis changes merged