Major rewrite to include 2 alternatives
Renamed to D3875