draft changes to support deterministic optimization