Patched for simulation mode