Fixed a major bug and removed unnecessary normalization