Changes to substring reference