Refactored and reflected p0u2w4.4