Update ventilation method
Fix conflicts