Modify simulator a little