prod version, polish stuff