Some upgrades for the cubicals