changes to optionally use collector data rather than the live system