Further simplification