Bring up to date with ricn/rika