01-02 tweakings