Working on bootstrap upgrade