Added updated Normal calculation code