Adapted extraction regex slightly.