done! + upgrade