Re-ordered functions pre-squash