updated models and clustering