Commit from Raaz tripathi latest update