Changes made by Neev Bagri (neevbagri@live.com).