Updated strict vs non-strict spillover handling