Issue #4: Removed need to use keyword if not in continuous mode.