0247: step two of major changes in mode2