And now I have refactored it so it does.