merged Lydia Guarinos changes