Commit by Anubhav-Version 1.1