Few design upgrades