New feature from Abhishek

Please accept these changes