New unwind function
Change argument order