swap 06 to current structure