Fixed general diagram U^_^