switch to working version while refactoring