New version with Original changes.