Put Viktor's simulation wrapper back