extraction improvements