Thin out the UPO needs section a bit. Ref #3