Improved normal computation