Change for rails4 and experimentation