Major simplifications.