added extract and other stuff