further modifications to match Borja