updated to work with ReRoll system