Updated to change screen based on roll