fix simplify and modify