Updated --upgrade command, removed more hardcode