Almost finished with structure extraction