Implement the full simplification & add a few more sepcifications