made simplifications work