Rearrange order of functions
Redo delta normalization to new system