Major simplification.