some updated to RoR