upstream improvements