Significant simplifications