N3[U2A6] refactor