* Cleaning up zhang vs full feature type thing