current status - before complete refactoring