Added simple logic for now for rolling