Rio logic & fixes