Added pre-computation of unwrap transformation