working on integration of new mode (original mode: p=66.08, r=58.53)