Slight refactor in roll.