Implemented 'simplified' and 'non-simplified' equations.