Added logic for rolling