finished re-arrangement. moved xpl up a level