Not needed if you do the refactoring I suggest ;)