Changes to sub