changed model back to ActiveModel standards