commit 05-09-02