Significant further simplifications