fix model, now passing all (uniqueness) tests