new version based on rails
resolved merge