Decoupled simulation + fixed bug