Cleaned up upgrade