update to work with rails master