More work on cap3 upgrade