more patches for more variants