Re-built with edits to Display model.