Update new logic to play well