A few changes to the new rolling logic. #35.