Changes to the original code