update extraction mechanisme
Better extractor