Revamp undertow subsystem