Trying to tighten model a bit