Updated model to reflect Ken's suggestions

refs #17595