added upgrade bypass