Jacalvo/upgrade improvements