Upgrade as and staggeredgrid