Significant simplifications
changes