moved more data from view to model
eol