partial rice upgrade.... still fixing tests