Added solve, Equal and Or