you're right. It is no more valid after refactoring