finally removed the last of the normalize snafu