Patched for simulation