extraction tool fixes by Anne