add None management in engine, still need to test