adding extraction and other stuff