basic simplify and commit first done