Updated to normalize correctly