last working version before major changes