new reveal mode + code refactoring and simplification