improve extraction