some updates per discussions with matei