Changed simulation logic