removed unneccessary buffering
added input for roll (disabled by default)