Added new extraction algo