Re-running with case even more simplified