major simplifications