Refactor next play 1 & next play 2