Changes made by Hasnain Meghani (hasnain@muxam.com).