Fixed equation

Final Commit. Review and comment