Adding back in multi simulation