[Master] :- Update in code after review