Added basic simplification