sync with Combine conventions; changed systematics