Updates for MP-02 code, add Single mode