updated with money-rails