added cases for different types of rolls and such. v1.1