Changes of 06-02

Stopped here