Adil and Zain changes

Please merge