add cubepix
merge fixes