small changesin expression swapper architecture