with q update in CHEASEgui from master