updated with gem changes needed for upgrade to rails