A little more rubyish and a new model