commit of XMASoC changes