[U2, U3] Refactor