updated for extraction