continuing Borja implementation