Working on non-determinism