updated for RoR