Added in model watch to allow for preselection