Adding revamp of normalize system