N2U1 double flavor N3U6 refactor