Updated simplifications