01-02-18 V 2.0 complete