Add switch for automatic behavior