[james] #X reverts to proper flow for each level