locations models improved