Move all into upgrade block