merge ceparSix code