Performance changes, removing squeeze, replace with permute.