Completed basic upgrade functionality