Updated due to extractions