merge simplify to master