Major changes, simplifications