Refactored dice selection to cater for results