Revert 'Reduce Cases to 4 Cases'