TODO note for future refactoring