better upgrade definitions