diff --git a/examples/arc72/artifacts/ARC72.approval.teal b/examples/arc72/artifacts/ARC72.approval.teal
index 2da5ad455..baf68fa65 100644
--- a/examples/arc72/artifacts/ARC72.approval.teal
+++ b/examples/arc72/artifacts/ARC72.approval.teal
@@ -53,9 +53,9 @@ arc72_ownerOf:
 	// examples/arc72/arc72.algo.ts:25
 	// return this.tokenBox(tokenId).value.owner;
 	frame_dig -1 // tokenId: uint256
-	box_get
-	assert
-	extract 0 32
+	int 0
+	int 32
+	box_extract
 	retsub
 
 abi_route_arc72_tokenURI:
@@ -90,11 +90,9 @@ arc72_tokenURI:
 	// examples/arc72/arc72.algo.ts:37
 	// return this.tokenBox(tokenId).value.uri;
 	frame_dig -1 // tokenId: uint256
-	box_get
-	assert
-	int 32
+	int 32 // headOffset
 	int 256
-	extract3
+	box_extract
 	retsub
 
 // transferTo(uint256,address)void
@@ -170,12 +168,10 @@ arc72_transferFrom:
 	dup
 	bnz skip_or0
 	txn Sender
-	frame_dig 0 // storage key//token
-	box_get
-	assert
-	int 288
+	frame_dig -3 // tokenId: uint256
+	int 288 // headOffset
 	int 32
-	extract3
+	box_extract
 	==
 	||
 
@@ -240,7 +236,7 @@ arc72_approve:
 	// examples/arc72/arc72.algo.ts:65
 	// this.tokenBox(tokenId).value.controller = approved
 	frame_dig -2 // tokenId: uint256
-	int 288
+	int 288 // headOffset
 	frame_dig -1 // approved: Address
 	box_replace
 	retsub
diff --git a/examples/arc72/artifacts/ARC72.arc32.json b/examples/arc72/artifacts/ARC72.arc32.json
index 637d91aa5..da57dc788 100644
--- a/examples/arc72/artifacts/ARC72.arc32.json
+++ b/examples/arc72/artifacts/ARC72.arc32.json
@@ -79,7 +79,7 @@
     }
   },
   "source": {
-    "approval": "#pragma version 9

// This TEAL was generated by TEALScript v0.74.0
// https://github.com/algorandfoundation/TEALScript

// This contract is compliant with and/or implements the following ARCs: [ ARC4 ]

// The following ten lines of TEAL handle initial program flow
// This pattern is used to make it easy for anyone to parse the start of the program and determine if a specific action is allowed
// Here, action refers to the OnComplete in combination with whether the app is being created or called
// Every possible action for this contract is represented in the switch statement
// If the action is not implmented in the contract, its respective branch will be "NOT_IMPLEMENTED" which just contains "err"
txn ApplicationID
!
int 6
*
txn OnCompletion
+
switch call_NoOp NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED create_NoOp NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED

NOT_IMPLEMENTED:
	err

abi_route_arc72_ownerOf:
	// The ABI return prefix
	byte 0x151f7c75

	// tokenId: uint256
	txna ApplicationArgs 1
	dup
	len
	int 32
	==
	assert

	// execute arc72_ownerOf(uint256)address
	callsub arc72_ownerOf
	concat
	log
	int 1
	return

// arc72_ownerOf(uint256)address
//
//
// Returns the address of the current owner of the NFT with the given tokenId
//
// @param tokenId The ID of the NFT
// @returns The current owner of the NFT
arc72_ownerOf:
	proto 1 1

	// examples/arc72/arc72.algo.ts:25
	// return this.tokenBox(tokenId).value.owner;
	frame_dig -1 // tokenId: uint256
	box_get
	assert
	extract 0 32
	retsub

abi_route_arc72_tokenURI:
	// The ABI return prefix
	byte 0x151f7c75

	// tokenId: uint256
	txna ApplicationArgs 1
	dup
	len
	int 32
	==
	assert

	// execute arc72_tokenURI(uint256)byte[256]
	callsub arc72_tokenURI
	concat
	log
	int 1
	return

// arc72_tokenURI(uint256)byte[256]
//
//
// Returns a URI pointing to the NFT metadata
//
// @param tokenId The ID of the NFT
// @returns URI to token metadata
arc72_tokenURI:
	proto 1 1

	// examples/arc72/arc72.algo.ts:37
	// return this.tokenBox(tokenId).value.uri;
	frame_dig -1 // tokenId: uint256
	box_get
	assert
	int 32
	int 256
	extract3
	retsub

// transferTo(uint256,address)void
transferTo:
	proto 2 0

	// examples/arc72/arc72.algo.ts:41
	// this.tokenBox(tokenId).value.owner = to
	frame_dig -2 // tokenId: uint256
	int 0
	frame_dig -1 // to: Address
	box_replace
	retsub

abi_route_arc72_transferFrom:
	// tokenId: uint256
	txna ApplicationArgs 3
	dup
	len
	int 32
	==
	assert

	// to: address
	txna ApplicationArgs 2
	dup
	len
	int 32
	==
	assert

	// _from: address
	txna ApplicationArgs 1
	dup
	len
	int 32
	==
	assert

	// execute arc72_transferFrom(uint256,address,address)void
	callsub arc72_transferFrom
	int 1
	return

// arc72_transferFrom(uint256,address,address)void
//
// Transfers ownership of an NFT
arc72_transferFrom:
	proto 3 0

	// Push empty bytes after the frame pointer to reserve space for local variables
	byte 0x
	dup

	// examples/arc72/arc72.algo.ts:48
	// token = this.tokenBox(tokenId).value
	frame_dig -3 // tokenId: uint256
	frame_bury 0 // storage key//token

	// examples/arc72/arc72.algo.ts:50
	// key: Control = { owner: this.txn.sender, controller: _from }
	txn Sender
	frame_dig -1 // _from: Address
	concat
	frame_bury 1 // key: Control

	// if0_condition
	// examples/arc72/arc72.algo.ts:52
	// this.txn.sender === _from || this.txn.sender === token.controller || this.controlBox(key).exists
	txn Sender
	frame_dig -1 // _from: Address
	==
	dup
	bnz skip_or0
	txn Sender
	frame_dig 0 // storage key//token
	box_get
	assert
	int 288
	int 32
	extract3
	==
	||

skip_or0:
	dup
	bnz skip_or1
	frame_dig 1 // key: Control
	box_len
	swap
	pop
	||

skip_or1:
	bz if0_else

	// if0_consequent
	// examples/arc72/arc72.algo.ts:53
	// this.transferTo(to, tokenId)
	frame_dig -3 // tokenId: uint256
	frame_dig -2 // to: Address
	callsub transferTo
	b if0_end

if0_else:
	err // 'Transfer not authorized'

if0_end:
	retsub

abi_route_arc72_approve:
	// tokenId: uint256
	txna ApplicationArgs 2
	dup
	len
	int 32
	==
	assert

	// approved: address
	txna ApplicationArgs 1
	dup
	len
	int 32
	==
	assert

	// execute arc72_approve(uint256,address)void
	callsub arc72_approve
	int 1
	return

// arc72_approve(uint256,address)void
//
//
// Approve a controller for a single NFT
//
// @param approved Approved controller address
// @param tokenId The ID of the NFT
arc72_approve:
	proto 2 0

	// examples/arc72/arc72.algo.ts:65
	// this.tokenBox(tokenId).value.controller = approved
	frame_dig -2 // tokenId: uint256
	int 288
	frame_dig -1 // approved: Address
	box_replace
	retsub

abi_route_arc72_setApprovalForAll:
	// approved: bool
	txna ApplicationArgs 2
	dup
	len
	int 1
	==
	assert
	int 0
	getbit

	// operator: address
	txna ApplicationArgs 1
	dup
	len
	int 32
	==
	assert

	// execute arc72_setApprovalForAll(bool,address)void
	callsub arc72_setApprovalForAll
	int 1
	return

// arc72_setApprovalForAll(bool,address)void
//
//
// Approve an operator for all NFTs for a user
//
// @param operator Approved operator address
// @param approved true to give approval, false to revoke
// @returns
arc72_setApprovalForAll:
	proto 2 0

	// Push empty bytes after the frame pointer to reserve space for local variables
	byte 0x

	// examples/arc72/arc72.algo.ts:77
	// key: Control = { owner: this.txn.sender, controller: operator }
	txn Sender
	frame_dig -1 // operator: Address
	concat
	frame_bury 0 // key: Control

	// if1_condition
	// examples/arc72/arc72.algo.ts:79
	// approved
	frame_dig -2 // approved: boolean
	bz if1_elseif1_condition

	// if1_consequent
	// examples/arc72/arc72.algo.ts:79
	// this.controlBox(key).value = ''
	frame_dig 0 // key: Control
	dup
	box_del
	pop
	byte 0x // ""
	box_put
	b if1_end

if1_elseif1_condition:
	// examples/arc72/arc72.algo.ts:80
	// this.controlBox(key).exists
	frame_dig 0 // key: Control
	box_len
	swap
	pop
	bz if1_end

	// if1_elseif1_consequent
	// examples/arc72/arc72.algo.ts:80
	// this.controlBox(key).delete()
	frame_dig 0 // key: Control
	box_del

if1_end:
	retsub

abi_route_mint:
	// to: address
	txna ApplicationArgs 1
	dup
	len
	int 32
	==
	assert

	// execute mint(address)void
	callsub mint
	int 1
	return

// mint(address)void
mint:
	proto 1 0

	// Push empty bytes after the frame pointer to reserve space for local variables
	byte 0x
	dup

	// examples/arc72/arc72.algo.ts:84
	// index = this.index.value
	byte 0x696e646578 // "index"
	app_global_get
	frame_bury 0 // index: uint256

	// examples/arc72/arc72.algo.ts:86
	// token: Token = {
	//       owner: to,
	//       uri: 'https://github.com/algorandfoundation/ARCs' as Bytes256,
	//       controller: Address.zeroAddress,
	//     }
	frame_dig -1 // to: Address
	byte 0x68747470733a2f2f6769746875622e636f6d2f616c676f72616e64666f756e646174696f6e2f4152437300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 // "https://github.com/algorandfoundation/ARCs"
	concat
	global ZeroAddress
	concat
	frame_bury 1 // token: Token

	// examples/arc72/arc72.algo.ts:92
	// this.tokenBox(index).value = token
	frame_dig 0 // index: uint256
	frame_dig 1 // token: Token
	box_put

	// examples/arc72/arc72.algo.ts:93
	// this.transferTo(to, index)
	frame_dig 0 // index: uint256
	frame_dig -1 // to: Address
	callsub transferTo

	// examples/arc72/arc72.algo.ts:94
	// this.index.value = index + 1
	byte 0x696e646578 // "index"
	frame_dig 0 // index: uint256
	byte 0x0000000000000000000000000000000000000000000000000000000000000001
	b+
	dup
	bitlen
	int 256
	<=
	assert
	byte 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
	b&
	dup
	len
	dup
	int 32
	-
	swap
	substring3
	app_global_put
	retsub

abi_route_arc72_totalSupply:
	// The ABI return prefix
	byte 0x151f7c75

	// execute arc72_totalSupply()uint256
	callsub arc72_totalSupply
	dup
	bitlen
	int 256
	<=
	assert
	byte 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
	b&
	dup
	len
	dup
	int 32
	-
	swap
	substring3
	concat
	log
	int 1
	return

// arc72_totalSupply()uint256
//
// Returns the number of NFTs currently defined by this contract
arc72_totalSupply:
	proto 0 1

	// examples/arc72/arc72.algo.ts:102
	// return this.index.value;
	byte 0x696e646578 // "index"
	app_global_get
	retsub

abi_route_arc72_tokenByIndex:
	// The ABI return prefix
	byte 0x151f7c75

	// index: uint256
	txna ApplicationArgs 1
	dup
	len
	int 32
	==
	assert

	// execute arc72_tokenByIndex(uint256)uint256
	callsub arc72_tokenByIndex
	dup
	bitlen
	int 256
	<=
	assert
	byte 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
	b&
	dup
	len
	dup
	int 32
	-
	swap
	substring3
	concat
	log
	int 1
	return

// arc72_tokenByIndex(uint256)uint256
//
// Returns the token ID of the token with the given index among all NFTs defined by the contract
arc72_tokenByIndex:
	proto 1 1

	// examples/arc72/arc72.algo.ts:110
	// return index;
	frame_dig -1 // index: uint256
	retsub

abi_route_createApplication:
	int 1
	return

create_NoOp:
	method "createApplication()void"
	txna ApplicationArgs 0
	match abi_route_createApplication
	err

call_NoOp:
	method "arc72_ownerOf(uint256)address"
	method "arc72_tokenURI(uint256)byte[256]"
	method "arc72_transferFrom(address,address,uint256)void"
	method "arc72_approve(address,uint256)void"
	method "arc72_setApprovalForAll(address,bool)void"
	method "mint(address)void"
	method "arc72_totalSupply()uint256"
	method "arc72_tokenByIndex(uint256)uint256"
	txna ApplicationArgs 0
	match abi_route_arc72_ownerOf abi_route_arc72_tokenURI abi_route_arc72_transferFrom abi_route_arc72_approve abi_route_arc72_setApprovalForAll abi_route_mint abi_route_arc72_totalSupply abi_route_arc72_tokenByIndex
	err",
+    "approval": "#pragma version 9

// This TEAL was generated by TEALScript v0.74.0
// https://github.com/algorandfoundation/TEALScript

// This contract is compliant with and/or implements the following ARCs: [ ARC4 ]

// The following ten lines of TEAL handle initial program flow
// This pattern is used to make it easy for anyone to parse the start of the program and determine if a specific action is allowed
// Here, action refers to the OnComplete in combination with whether the app is being created or called
// Every possible action for this contract is represented in the switch statement
// If the action is not implmented in the contract, its respective branch will be "NOT_IMPLEMENTED" which just contains "err"
txn ApplicationID
!
int 6
*
txn OnCompletion
+
switch call_NoOp NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED create_NoOp NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED

NOT_IMPLEMENTED:
	err

abi_route_arc72_ownerOf:
	// The ABI return prefix
	byte 0x151f7c75

	// tokenId: uint256
	txna ApplicationArgs 1
	dup
	len
	int 32
	==
	assert

	// execute arc72_ownerOf(uint256)address
	callsub arc72_ownerOf
	concat
	log
	int 1
	return

// arc72_ownerOf(uint256)address
//
//
// Returns the address of the current owner of the NFT with the given tokenId
//
// @param tokenId The ID of the NFT
// @returns The current owner of the NFT
arc72_ownerOf:
	proto 1 1

	// examples/arc72/arc72.algo.ts:25
	// return this.tokenBox(tokenId).value.owner;
	frame_dig -1 // tokenId: uint256
	int 0
	int 32
	box_extract
	retsub

abi_route_arc72_tokenURI:
	// The ABI return prefix
	byte 0x151f7c75

	// tokenId: uint256
	txna ApplicationArgs 1
	dup
	len
	int 32
	==
	assert

	// execute arc72_tokenURI(uint256)byte[256]
	callsub arc72_tokenURI
	concat
	log
	int 1
	return

// arc72_tokenURI(uint256)byte[256]
//
//
// Returns a URI pointing to the NFT metadata
//
// @param tokenId The ID of the NFT
// @returns URI to token metadata
arc72_tokenURI:
	proto 1 1

	// examples/arc72/arc72.algo.ts:37
	// return this.tokenBox(tokenId).value.uri;
	frame_dig -1 // tokenId: uint256
	int 32 // headOffset
	int 256
	box_extract
	retsub

// transferTo(uint256,address)void
transferTo:
	proto 2 0

	// examples/arc72/arc72.algo.ts:41
	// this.tokenBox(tokenId).value.owner = to
	frame_dig -2 // tokenId: uint256
	int 0
	frame_dig -1 // to: Address
	box_replace
	retsub

abi_route_arc72_transferFrom:
	// tokenId: uint256
	txna ApplicationArgs 3
	dup
	len
	int 32
	==
	assert

	// to: address
	txna ApplicationArgs 2
	dup
	len
	int 32
	==
	assert

	// _from: address
	txna ApplicationArgs 1
	dup
	len
	int 32
	==
	assert

	// execute arc72_transferFrom(uint256,address,address)void
	callsub arc72_transferFrom
	int 1
	return

// arc72_transferFrom(uint256,address,address)void
//
// Transfers ownership of an NFT
arc72_transferFrom:
	proto 3 0

	// Push empty bytes after the frame pointer to reserve space for local variables
	byte 0x
	dup

	// examples/arc72/arc72.algo.ts:48
	// token = this.tokenBox(tokenId).value
	frame_dig -3 // tokenId: uint256
	frame_bury 0 // storage key//token

	// examples/arc72/arc72.algo.ts:50
	// key: Control = { owner: this.txn.sender, controller: _from }
	txn Sender
	frame_dig -1 // _from: Address
	concat
	frame_bury 1 // key: Control

	// if0_condition
	// examples/arc72/arc72.algo.ts:52
	// this.txn.sender === _from || this.txn.sender === token.controller || this.controlBox(key).exists
	txn Sender
	frame_dig -1 // _from: Address
	==
	dup
	bnz skip_or0
	txn Sender
	frame_dig -3 // tokenId: uint256
	int 288 // headOffset
	int 32
	box_extract
	==
	||

skip_or0:
	dup
	bnz skip_or1
	frame_dig 1 // key: Control
	box_len
	swap
	pop
	||

skip_or1:
	bz if0_else

	// if0_consequent
	// examples/arc72/arc72.algo.ts:53
	// this.transferTo(to, tokenId)
	frame_dig -3 // tokenId: uint256
	frame_dig -2 // to: Address
	callsub transferTo
	b if0_end

if0_else:
	err // 'Transfer not authorized'

if0_end:
	retsub

abi_route_arc72_approve:
	// tokenId: uint256
	txna ApplicationArgs 2
	dup
	len
	int 32
	==
	assert

	// approved: address
	txna ApplicationArgs 1
	dup
	len
	int 32
	==
	assert

	// execute arc72_approve(uint256,address)void
	callsub arc72_approve
	int 1
	return

// arc72_approve(uint256,address)void
//
//
// Approve a controller for a single NFT
//
// @param approved Approved controller address
// @param tokenId The ID of the NFT
arc72_approve:
	proto 2 0

	// examples/arc72/arc72.algo.ts:65
	// this.tokenBox(tokenId).value.controller = approved
	frame_dig -2 // tokenId: uint256
	int 288 // headOffset
	frame_dig -1 // approved: Address
	box_replace
	retsub

abi_route_arc72_setApprovalForAll:
	// approved: bool
	txna ApplicationArgs 2
	dup
	len
	int 1
	==
	assert
	int 0
	getbit

	// operator: address
	txna ApplicationArgs 1
	dup
	len
	int 32
	==
	assert

	// execute arc72_setApprovalForAll(bool,address)void
	callsub arc72_setApprovalForAll
	int 1
	return

// arc72_setApprovalForAll(bool,address)void
//
//
// Approve an operator for all NFTs for a user
//
// @param operator Approved operator address
// @param approved true to give approval, false to revoke
// @returns
arc72_setApprovalForAll:
	proto 2 0

	// Push empty bytes after the frame pointer to reserve space for local variables
	byte 0x

	// examples/arc72/arc72.algo.ts:77
	// key: Control = { owner: this.txn.sender, controller: operator }
	txn Sender
	frame_dig -1 // operator: Address
	concat
	frame_bury 0 // key: Control

	// if1_condition
	// examples/arc72/arc72.algo.ts:79
	// approved
	frame_dig -2 // approved: boolean
	bz if1_elseif1_condition

	// if1_consequent
	// examples/arc72/arc72.algo.ts:79
	// this.controlBox(key).value = ''
	frame_dig 0 // key: Control
	dup
	box_del
	pop
	byte 0x // ""
	box_put
	b if1_end

if1_elseif1_condition:
	// examples/arc72/arc72.algo.ts:80
	// this.controlBox(key).exists
	frame_dig 0 // key: Control
	box_len
	swap
	pop
	bz if1_end

	// if1_elseif1_consequent
	// examples/arc72/arc72.algo.ts:80
	// this.controlBox(key).delete()
	frame_dig 0 // key: Control
	box_del

if1_end:
	retsub

abi_route_mint:
	// to: address
	txna ApplicationArgs 1
	dup
	len
	int 32
	==
	assert

	// execute mint(address)void
	callsub mint
	int 1
	return

// mint(address)void
mint:
	proto 1 0

	// Push empty bytes after the frame pointer to reserve space for local variables
	byte 0x
	dup

	// examples/arc72/arc72.algo.ts:84
	// index = this.index.value
	byte 0x696e646578 // "index"
	app_global_get
	frame_bury 0 // index: uint256

	// examples/arc72/arc72.algo.ts:86
	// token: Token = {
	//       owner: to,
	//       uri: 'https://github.com/algorandfoundation/ARCs' as Bytes256,
	//       controller: Address.zeroAddress,
	//     }
	frame_dig -1 // to: Address
	byte 0x68747470733a2f2f6769746875622e636f6d2f616c676f72616e64666f756e646174696f6e2f4152437300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 // "https://github.com/algorandfoundation/ARCs"
	concat
	global ZeroAddress
	concat
	frame_bury 1 // token: Token

	// examples/arc72/arc72.algo.ts:92
	// this.tokenBox(index).value = token
	frame_dig 0 // index: uint256
	frame_dig 1 // token: Token
	box_put

	// examples/arc72/arc72.algo.ts:93
	// this.transferTo(to, index)
	frame_dig 0 // index: uint256
	frame_dig -1 // to: Address
	callsub transferTo

	// examples/arc72/arc72.algo.ts:94
	// this.index.value = index + 1
	byte 0x696e646578 // "index"
	frame_dig 0 // index: uint256
	byte 0x0000000000000000000000000000000000000000000000000000000000000001
	b+
	dup
	bitlen
	int 256
	<=
	assert
	byte 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
	b&
	dup
	len
	dup
	int 32
	-
	swap
	substring3
	app_global_put
	retsub

abi_route_arc72_totalSupply:
	// The ABI return prefix
	byte 0x151f7c75

	// execute arc72_totalSupply()uint256
	callsub arc72_totalSupply
	dup
	bitlen
	int 256
	<=
	assert
	byte 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
	b&
	dup
	len
	dup
	int 32
	-
	swap
	substring3
	concat
	log
	int 1
	return

// arc72_totalSupply()uint256
//
// Returns the number of NFTs currently defined by this contract
arc72_totalSupply:
	proto 0 1

	// examples/arc72/arc72.algo.ts:102
	// return this.index.value;
	byte 0x696e646578 // "index"
	app_global_get
	retsub

abi_route_arc72_tokenByIndex:
	// The ABI return prefix
	byte 0x151f7c75

	// index: uint256
	txna ApplicationArgs 1
	dup
	len
	int 32
	==
	assert

	// execute arc72_tokenByIndex(uint256)uint256
	callsub arc72_tokenByIndex
	dup
	bitlen
	int 256
	<=
	assert
	byte 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
	b&
	dup
	len
	dup
	int 32
	-
	swap
	substring3
	concat
	log
	int 1
	return

// arc72_tokenByIndex(uint256)uint256
//
// Returns the token ID of the token with the given index among all NFTs defined by the contract
arc72_tokenByIndex:
	proto 1 1

	// examples/arc72/arc72.algo.ts:110
	// return index;
	frame_dig -1 // index: uint256
	retsub

abi_route_createApplication:
	int 1
	return

create_NoOp:
	method "createApplication()void"
	txna ApplicationArgs 0
	match abi_route_createApplication
	err

call_NoOp:
	method "arc72_ownerOf(uint256)address"
	method "arc72_tokenURI(uint256)byte[256]"
	method "arc72_transferFrom(address,address,uint256)void"
	method "arc72_approve(address,uint256)void"
	method "arc72_setApprovalForAll(address,bool)void"
	method "mint(address)void"
	method "arc72_totalSupply()uint256"
	method "arc72_tokenByIndex(uint256)uint256"
	txna ApplicationArgs 0
	match abi_route_arc72_ownerOf abi_route_arc72_tokenURI abi_route_arc72_transferFrom abi_route_arc72_approve abi_route_arc72_setApprovalForAll abi_route_mint abi_route_arc72_totalSupply abi_route_arc72_tokenByIndex
	err",
     "clear": "I3ByYWdtYSB2ZXJzaW9uIDk="
   },
   "contract": {
diff --git a/examples/arc72/artifacts/ARC72.src_map.json b/examples/arc72/artifacts/ARC72.src_map.json
index 20c825a13..7592ab671 100644
--- a/examples/arc72/artifacts/ARC72.src_map.json
+++ b/examples/arc72/artifacts/ARC72.src_map.json
@@ -269,207 +269,207 @@
     "teal": 58,
     "source": 25,
     "pc": [
-      116,
-      117,
-      118
+      116
     ]
   },
   {
     "teal": 59,
     "source": 25,
     "pc": [
-      119
+      117
     ]
   },
   {
     "teal": 63,
     "source": 35,
     "pc": [
-      120
+      118
     ]
   },
   {
     "teal": 66,
     "source": 36,
     "pc": [
-      121,
-      122,
-      123
+      119,
+      120,
+      121
     ]
   },
   {
     "teal": 67,
     "source": 36,
     "pc": [
-      124
+      122
     ]
   },
   {
     "teal": 68,
     "source": 36,
     "pc": [
-      125
+      123
     ]
   },
   {
     "teal": 69,
     "source": 36,
     "pc": [
-      126
+      124
     ]
   },
   {
     "teal": 70,
     "source": 36,
     "pc": [
-      127
+      125
     ]
   },
   {
     "teal": 71,
     "source": 36,
     "pc": [
-      128
+      126
     ]
   },
   {
     "teal": 74,
     "source": 35,
     "pc": [
-      129,
-      130,
-      131
+      127,
+      128,
+      129
     ]
   },
   {
     "teal": 75,
     "source": 35,
     "pc": [
-      132
+      130
     ]
   },
   {
     "teal": 76,
     "source": 35,
     "pc": [
-      133
+      131
     ]
   },
   {
     "teal": 77,
     "source": 35,
     "pc": [
-      134
+      132
     ]
   },
   {
     "teal": 78,
     "source": 35,
     "pc": [
-      135
+      133
     ]
   },
   {
     "teal": 88,
     "source": 35,
     "pc": [
-      136,
-      137,
-      138
+      134,
+      135,
+      136
     ]
   },
   {
     "teal": 92,
     "source": 37,
     "pc": [
-      139,
-      140
+      137,
+      138
     ]
   },
   {
     "teal": 93,
     "source": 37,
     "pc": [
-      141
+      139
     ]
   },
   {
     "teal": 94,
     "source": 37,
     "pc": [
-      142
+      140
     ]
   },
   {
     "teal": 95,
     "source": 37,
     "pc": [
-      143
+      141
     ]
   },
   {
     "teal": 96,
     "source": 37,
     "pc": [
-      144
+      142
     ]
   },
   {
-    "teal": 97,
-    "source": 37,
+    "teal": 100,
+    "source": 40,
     "pc": [
+      143,
+      144,
       145
     ]
   },
   {
-    "teal": 98,
-    "source": 37,
+    "teal": 104,
+    "source": 41,
     "pc": [
-      146
+      146,
+      147
     ]
   },
   {
-    "teal": 102,
-    "source": 40,
+    "teal": 105,
+    "source": 41,
     "pc": [
-      147,
-      148,
-      149
+      148
     ]
   },
   {
     "teal": 106,
     "source": 41,
     "pc": [
-      150,
-      151
+      149,
+      150
     ]
   },
   {
     "teal": 107,
     "source": 41,
     "pc": [
-      152
+      151
     ]
   },
   {
     "teal": 108,
-    "source": 41,
+    "source": 40,
     "pc": [
-      153,
-      154
+      152
     ]
   },
   {
-    "teal": 109,
-    "source": 41,
+    "teal": 112,
+    "source": 47,
     "pc": [
+      153,
+      154,
       155
     ]
   },
   {
-    "teal": 110,
-    "source": 40,
+    "teal": 113,
+    "source": 47,
     "pc": [
       156
     ]
@@ -478,41 +478,41 @@
     "teal": 114,
     "source": 47,
     "pc": [
-      157,
-      158,
-      159
+      157
     ]
   },
   {
     "teal": 115,
     "source": 47,
     "pc": [
-      160
+      158
     ]
   },
   {
     "teal": 116,
     "source": 47,
     "pc": [
-      161
+      159
     ]
   },
   {
     "teal": 117,
     "source": 47,
     "pc": [
-      162
+      160
     ]
   },
   {
-    "teal": 118,
+    "teal": 120,
     "source": 47,
     "pc": [
+      161,
+      162,
       163
     ]
   },
   {
-    "teal": 119,
+    "teal": 121,
     "source": 47,
     "pc": [
       164
@@ -522,41 +522,41 @@
     "teal": 122,
     "source": 47,
     "pc": [
-      165,
-      166,
-      167
+      165
     ]
   },
   {
     "teal": 123,
     "source": 47,
     "pc": [
-      168
+      166
     ]
   },
   {
     "teal": 124,
     "source": 47,
     "pc": [
-      169
+      167
     ]
   },
   {
     "teal": 125,
     "source": 47,
     "pc": [
-      170
+      168
     ]
   },
   {
-    "teal": 126,
+    "teal": 128,
     "source": 47,
     "pc": [
+      169,
+      170,
       171
     ]
   },
   {
-    "teal": 127,
+    "teal": 129,
     "source": 47,
     "pc": [
       172
@@ -566,41 +566,41 @@
     "teal": 130,
     "source": 47,
     "pc": [
-      173,
-      174,
-      175
+      173
     ]
   },
   {
     "teal": 131,
     "source": 47,
     "pc": [
-      176
+      174
     ]
   },
   {
     "teal": 132,
     "source": 47,
     "pc": [
-      177
+      175
     ]
   },
   {
     "teal": 133,
     "source": 47,
     "pc": [
-      178
+      176
     ]
   },
   {
-    "teal": 134,
+    "teal": 136,
     "source": 47,
     "pc": [
+      177,
+      178,
       179
     ]
   },
   {
-    "teal": 135,
+    "teal": 137,
     "source": 47,
     "pc": [
       180
@@ -610,59 +610,59 @@
     "teal": 138,
     "source": 47,
     "pc": [
-      181,
-      182,
-      183
+      181
     ]
   },
   {
-    "teal": 139,
+    "teal": 144,
     "source": 47,
     "pc": [
+      182,
+      183,
       184
     ]
   },
   {
-    "teal": 140,
+    "teal": 147,
     "source": 47,
     "pc": [
       185
     ]
   },
   {
-    "teal": 146,
+    "teal": 148,
     "source": 47,
     "pc": [
-      186,
-      187,
-      188
+      186
     ]
   },
   {
-    "teal": 149,
-    "source": 47,
+    "teal": 152,
+    "source": 48,
     "pc": [
-      189
+      187,
+      188
     ]
   },
   {
-    "teal": 150,
-    "source": 47,
+    "teal": 153,
+    "source": 48,
     "pc": [
+      189,
       190
     ]
   },
   {
-    "teal": 154,
-    "source": 48,
+    "teal": 157,
+    "source": 50,
     "pc": [
       191,
       192
     ]
   },
   {
-    "teal": 155,
-    "source": 48,
+    "teal": 158,
+    "source": 50,
     "pc": [
       193,
       194
@@ -672,28 +672,28 @@
     "teal": 159,
     "source": 50,
     "pc": [
-      195,
-      196
+      195
     ]
   },
   {
     "teal": 160,
     "source": 50,
     "pc": [
-      197,
-      198
+      196,
+      197
     ]
   },
   {
-    "teal": 161,
-    "source": 50,
+    "teal": 165,
+    "source": 52,
     "pc": [
+      198,
       199
     ]
   },
   {
-    "teal": 162,
-    "source": 50,
+    "teal": 166,
+    "source": 52,
     "pc": [
       200,
       201
@@ -703,22 +703,22 @@
     "teal": 167,
     "source": 52,
     "pc": [
-      202,
-      203
+      202
     ]
   },
   {
     "teal": 168,
     "source": 52,
     "pc": [
-      204,
-      205
+      203
     ]
   },
   {
     "teal": 169,
     "source": 52,
     "pc": [
+      204,
+      205,
       206
     ]
   },
@@ -726,21 +726,21 @@
     "teal": 170,
     "source": 52,
     "pc": [
-      207
+      207,
+      208
     ]
   },
   {
     "teal": 171,
-    "source": 52,
+    "source": 48,
     "pc": [
-      208,
       209,
       210
     ]
   },
   {
     "teal": 172,
-    "source": 52,
+    "source": 48,
     "pc": [
       211,
       212
@@ -750,165 +750,165 @@
     "teal": 173,
     "source": 48,
     "pc": [
-      213,
-      214
+      213
     ]
   },
   {
     "teal": 174,
     "source": 48,
     "pc": [
-      215
+      214
     ]
   },
   {
     "teal": 175,
-    "source": 48,
+    "source": 52,
     "pc": [
-      216
+      215
     ]
   },
   {
     "teal": 176,
     "source": 52,
     "pc": [
-      217,
-      218
+      216
     ]
   },
   {
-    "teal": 177,
+    "teal": 179,
     "source": 52,
     "pc": [
-      219
+      217
     ]
   },
   {
-    "teal": 178,
+    "teal": 180,
     "source": 52,
     "pc": [
+      218,
+      219,
       220
     ]
   },
   {
-    "teal": 179,
+    "teal": 181,
     "source": 52,
     "pc": [
-      221
+      221,
+      222
     ]
   },
   {
-    "teal": 180,
+    "teal": 182,
     "source": 52,
     "pc": [
-      222
+      223
     ]
   },
   {
     "teal": 183,
     "source": 52,
     "pc": [
-      223
+      224
     ]
   },
   {
     "teal": 184,
     "source": 52,
     "pc": [
-      224,
-      225,
-      226
+      225
     ]
   },
   {
     "teal": 185,
     "source": 52,
     "pc": [
-      227,
-      228
+      226
     ]
   },
   {
-    "teal": 186,
+    "teal": 188,
     "source": 52,
     "pc": [
+      227,
+      228,
       229
     ]
   },
   {
-    "teal": 187,
-    "source": 52,
+    "teal": 193,
+    "source": 53,
     "pc": [
-      230
+      230,
+      231
     ]
   },
   {
-    "teal": 188,
-    "source": 52,
+    "teal": 194,
+    "source": 53,
     "pc": [
-      231
+      232,
+      233
     ]
   },
   {
-    "teal": 189,
-    "source": 52,
+    "teal": 195,
+    "source": 53,
     "pc": [
-      232
+      234,
+      235,
+      236
     ]
   },
   {
-    "teal": 192,
+    "teal": 196,
     "source": 52,
     "pc": [
-      233,
-      234,
-      235
+      237,
+      238,
+      239
     ]
   },
   {
-    "teal": 197,
-    "source": 53,
+    "teal": 199,
+    "source": 54,
     "pc": [
-      236,
-      237
+      240
     ]
   },
   {
-    "teal": 198,
-    "source": 53,
+    "teal": 202,
+    "source": 47,
     "pc": [
-      238,
-      239
+      241
     ]
   },
   {
-    "teal": 199,
-    "source": 53,
+    "teal": 206,
+    "source": 64,
     "pc": [
-      240,
-      241,
-      242
+      242,
+      243,
+      244
     ]
   },
   {
-    "teal": 200,
-    "source": 52,
+    "teal": 207,
+    "source": 64,
     "pc": [
-      243,
-      244,
       245
     ]
   },
   {
-    "teal": 203,
-    "source": 54,
+    "teal": 208,
+    "source": 64,
     "pc": [
       246
     ]
   },
   {
-    "teal": 206,
-    "source": 47,
+    "teal": 209,
+    "source": 64,
     "pc": [
       247
     ]
@@ -917,41 +917,41 @@
     "teal": 210,
     "source": 64,
     "pc": [
-      248,
-      249,
-      250
+      248
     ]
   },
   {
     "teal": 211,
     "source": 64,
     "pc": [
-      251
+      249
     ]
   },
   {
-    "teal": 212,
+    "teal": 214,
     "source": 64,
     "pc": [
+      250,
+      251,
       252
     ]
   },
   {
-    "teal": 213,
+    "teal": 215,
     "source": 64,
     "pc": [
       253
     ]
   },
   {
-    "teal": 214,
+    "teal": 216,
     "source": 64,
     "pc": [
       254
     ]
   },
   {
-    "teal": 215,
+    "teal": 217,
     "source": 64,
     "pc": [
       255
@@ -961,112 +961,112 @@
     "teal": 218,
     "source": 64,
     "pc": [
-      256,
-      257,
-      258
+      256
     ]
   },
   {
     "teal": 219,
     "source": 64,
     "pc": [
-      259
+      257
     ]
   },
   {
-    "teal": 220,
+    "teal": 222,
     "source": 64,
     "pc": [
+      258,
+      259,
       260
     ]
   },
   {
-    "teal": 221,
+    "teal": 223,
     "source": 64,
     "pc": [
       261
     ]
   },
   {
-    "teal": 222,
+    "teal": 224,
     "source": 64,
     "pc": [
       262
     ]
   },
   {
-    "teal": 223,
-    "source": 64,
-    "pc": [
-      263
-    ]
-  },
-  {
-    "teal": 226,
+    "teal": 234,
     "source": 64,
     "pc": [
+      263,
       264,
-      265,
-      266
+      265
     ]
   },
   {
-    "teal": 227,
-    "source": 64,
+    "teal": 238,
+    "source": 65,
     "pc": [
+      266,
       267
     ]
   },
   {
-    "teal": 228,
-    "source": 64,
+    "teal": 239,
+    "source": 65,
     "pc": [
-      268
+      268,
+      269
     ]
   },
   {
-    "teal": 238,
-    "source": 64,
+    "teal": 240,
+    "source": 65,
     "pc": [
-      269,
       270,
       271
     ]
   },
   {
-    "teal": 242,
+    "teal": 241,
     "source": 65,
     "pc": [
-      272,
+      272
+    ]
+  },
+  {
+    "teal": 242,
+    "source": 64,
+    "pc": [
       273
     ]
   },
   {
-    "teal": 243,
-    "source": 65,
+    "teal": 246,
+    "source": 76,
     "pc": [
       274,
-      275
+      275,
+      276
     ]
   },
   {
-    "teal": 244,
-    "source": 65,
+    "teal": 247,
+    "source": 76,
     "pc": [
-      276,
       277
     ]
   },
   {
-    "teal": 245,
-    "source": 65,
+    "teal": 248,
+    "source": 76,
     "pc": [
       278
     ]
   },
   {
-    "teal": 246,
-    "source": 64,
+    "teal": 249,
+    "source": 76,
     "pc": [
       279
     ]
@@ -1075,55 +1075,55 @@
     "teal": 250,
     "source": 76,
     "pc": [
-      280,
-      281,
-      282
+      280
     ]
   },
   {
     "teal": 251,
     "source": 76,
     "pc": [
-      283
+      281
     ]
   },
   {
     "teal": 252,
     "source": 76,
     "pc": [
-      284
+      282
     ]
   },
   {
     "teal": 253,
     "source": 76,
     "pc": [
-      285
+      283
     ]
   },
   {
-    "teal": 254,
+    "teal": 256,
     "source": 76,
     "pc": [
+      284,
+      285,
       286
     ]
   },
   {
-    "teal": 255,
+    "teal": 257,
     "source": 76,
     "pc": [
       287
     ]
   },
   {
-    "teal": 256,
+    "teal": 258,
     "source": 76,
     "pc": [
       288
     ]
   },
   {
-    "teal": 257,
+    "teal": 259,
     "source": 76,
     "pc": [
       289
@@ -1133,369 +1133,345 @@
     "teal": 260,
     "source": 76,
     "pc": [
-      290,
-      291,
-      292
+      290
     ]
   },
   {
     "teal": 261,
     "source": 76,
     "pc": [
-      293
+      291
     ]
   },
   {
-    "teal": 262,
+    "teal": 264,
     "source": 76,
     "pc": [
+      292,
+      293,
       294
     ]
   },
   {
-    "teal": 263,
+    "teal": 265,
     "source": 76,
     "pc": [
       295
     ]
   },
   {
-    "teal": 264,
+    "teal": 266,
     "source": 76,
     "pc": [
       296
     ]
   },
   {
-    "teal": 265,
-    "source": 76,
-    "pc": [
-      297
-    ]
-  },
-  {
-    "teal": 268,
+    "teal": 277,
     "source": 76,
     "pc": [
+      297,
       298,
-      299,
-      300
+      299
     ]
   },
   {
-    "teal": 269,
+    "teal": 280,
     "source": 76,
     "pc": [
-      301
-    ]
-  },
-  {
-    "teal": 270,
-    "source": 76,
-    "pc": [
-      302
-    ]
-  },
-  {
-    "teal": 281,
-    "source": 76,
-    "pc": [
-      303,
-      304,
-      305
+      300
     ]
   },
   {
     "teal": 284,
-    "source": 76,
-    "pc": [
-      306
-    ]
-  },
-  {
-    "teal": 288,
     "source": 77,
     "pc": [
-      307,
-      308
+      301,
+      302
     ]
   },
   {
-    "teal": 289,
+    "teal": 285,
     "source": 77,
     "pc": [
-      309,
-      310
+      303,
+      304
     ]
   },
   {
-    "teal": 290,
+    "teal": 286,
     "source": 77,
     "pc": [
-      311
+      305
     ]
   },
   {
-    "teal": 291,
+    "teal": 287,
     "source": 77,
     "pc": [
-      312,
-      313
+      306,
+      307
     ]
   },
   {
-    "teal": 296,
+    "teal": 292,
     "source": 79,
     "pc": [
-      314,
-      315
+      308,
+      309
     ]
   },
   {
-    "teal": 297,
+    "teal": 293,
     "source": 79,
     "pc": [
-      316,
-      317,
-      318
+      310,
+      311,
+      312
     ]
   },
   {
-    "teal": 302,
+    "teal": 298,
     "source": 79,
     "pc": [
-      319,
-      320
+      313,
+      314
     ]
   },
   {
-    "teal": 303,
+    "teal": 299,
     "source": 79,
     "pc": [
-      321
+      315
     ]
   },
   {
-    "teal": 304,
+    "teal": 300,
     "source": 79,
     "pc": [
-      322
+      316
     ]
   },
   {
-    "teal": 305,
+    "teal": 301,
     "source": 79,
     "pc": [
-      323
+      317
     ]
   },
   {
-    "teal": 306,
+    "teal": 302,
     "source": 79,
     "pc": [
-      324
+      318
     ]
   },
   {
-    "teal": 307,
+    "teal": 303,
     "source": 79,
     "pc": [
-      325
+      319
     ]
   },
   {
-    "teal": 308,
+    "teal": 304,
     "source": 79,
     "pc": [
-      326,
-      327,
-      328
+      320,
+      321,
+      322
     ]
   },
   {
-    "teal": 313,
+    "teal": 309,
     "source": 80,
     "pc": [
-      329,
-      330
+      323,
+      324
     ]
   },
   {
-    "teal": 314,
+    "teal": 310,
     "source": 80,
     "pc": [
-      331
+      325
     ]
   },
   {
-    "teal": 315,
+    "teal": 311,
     "source": 80,
     "pc": [
-      332
+      326
     ]
   },
   {
-    "teal": 316,
+    "teal": 312,
     "source": 80,
     "pc": [
-      333
+      327
     ]
   },
   {
-    "teal": 317,
+    "teal": 313,
     "source": 80,
     "pc": [
-      334,
-      335,
-      336
+      328,
+      329,
+      330
     ]
   },
   {
-    "teal": 322,
+    "teal": 318,
     "source": 80,
     "pc": [
-      337,
-      338
+      331,
+      332
     ]
   },
   {
-    "teal": 323,
+    "teal": 319,
     "source": 80,
     "pc": [
-      339
+      333
     ]
   },
   {
-    "teal": 326,
+    "teal": 322,
     "source": 76,
     "pc": [
-      340
+      334
     ]
   },
   {
-    "teal": 330,
+    "teal": 326,
     "source": 83,
     "pc": [
-      341,
-      342,
-      343
+      335,
+      336,
+      337
     ]
   },
   {
-    "teal": 331,
+    "teal": 327,
     "source": 83,
     "pc": [
-      344
+      338
     ]
   },
   {
-    "teal": 332,
+    "teal": 328,
     "source": 83,
     "pc": [
-      345
+      339
     ]
   },
   {
-    "teal": 333,
+    "teal": 329,
     "source": 83,
     "pc": [
-      346
+      340
     ]
   },
   {
-    "teal": 334,
+    "teal": 330,
     "source": 83,
     "pc": [
-      347
+      341
     ]
   },
   {
-    "teal": 335,
+    "teal": 331,
     "source": 83,
     "pc": [
-      348
+      342
     ]
   },
   {
-    "teal": 338,
+    "teal": 334,
     "source": 83,
     "pc": [
-      349,
-      350,
-      351
+      343,
+      344,
+      345
     ]
   },
   {
-    "teal": 339,
+    "teal": 335,
     "source": 83,
     "pc": [
-      352
+      346
     ]
   },
   {
-    "teal": 340,
+    "teal": 336,
     "source": 83,
     "pc": [
-      353
+      347
     ]
   },
   {
-    "teal": 344,
+    "teal": 340,
     "source": 83,
     "pc": [
-      354,
-      355,
-      356
+      348,
+      349,
+      350
     ]
   },
   {
-    "teal": 347,
+    "teal": 343,
     "source": 83,
     "pc": [
-      357
+      351
     ]
   },
   {
-    "teal": 348,
+    "teal": 344,
     "source": 83,
     "pc": [
-      358
+      352
     ]
   },
   {
-    "teal": 352,
+    "teal": 348,
     "source": 84,
     "pc": [
-      359
+      353
     ]
   },
   {
-    "teal": 353,
+    "teal": 349,
     "source": 84,
     "pc": [
-      360
+      354
     ]
   },
   {
-    "teal": 354,
+    "teal": 350,
     "source": 84,
     "pc": [
-      361,
-      362
+      355,
+      356
     ]
   },
   {
-    "teal": 362,
+    "teal": 358,
     "source": 87,
     "pc": [
-      363,
-      364
+      357,
+      358
     ]
   },
   {
-    "teal": 363,
+    "teal": 359,
     "source": 88,
     "pc": [
+      359,
+      360,
+      361,
+      362,
+      363,
+      364,
       365,
       366,
       367,
@@ -1748,112 +1724,112 @@
       614,
       615,
       616,
-      617,
-      618,
-      619,
-      620,
-      621,
-      622,
-      623
+      617
     ]
   },
   {
-    "teal": 364,
+    "teal": 360,
     "source": 88,
     "pc": [
-      624
+      618
     ]
   },
   {
-    "teal": 365,
+    "teal": 361,
     "source": 89,
     "pc": [
-      625,
-      626
+      619,
+      620
     ]
   },
   {
-    "teal": 366,
+    "teal": 362,
     "source": 89,
     "pc": [
-      627
+      621
     ]
   },
   {
-    "teal": 367,
+    "teal": 363,
     "source": 86,
     "pc": [
-      628,
-      629
+      622,
+      623
     ]
   },
   {
-    "teal": 371,
+    "teal": 367,
     "source": 92,
     "pc": [
-      630,
-      631
+      624,
+      625
     ]
   },
   {
-    "teal": 372,
+    "teal": 368,
     "source": 92,
     "pc": [
-      632,
-      633
+      626,
+      627
     ]
   },
   {
-    "teal": 373,
+    "teal": 369,
     "source": 92,
     "pc": [
-      634
+      628
     ]
   },
   {
-    "teal": 377,
+    "teal": 373,
     "source": 93,
     "pc": [
-      635,
-      636
+      629,
+      630
     ]
   },
   {
-    "teal": 378,
+    "teal": 374,
     "source": 93,
     "pc": [
-      637,
-      638
+      631,
+      632
     ]
   },
   {
-    "teal": 379,
+    "teal": 375,
     "source": 93,
     "pc": [
-      639,
-      640,
-      641
+      633,
+      634,
+      635
     ]
   },
   {
-    "teal": 383,
+    "teal": 379,
     "source": 94,
     "pc": [
-      642
+      636
     ]
   },
   {
-    "teal": 384,
+    "teal": 380,
     "source": 94,
     "pc": [
-      643,
-      644
+      637,
+      638
     ]
   },
   {
-    "teal": 385,
+    "teal": 381,
     "source": 94,
     "pc": [
+      639,
+      640,
+      641,
+      642,
+      643,
+      644,
       645,
       646,
       647,
@@ -1881,136 +1857,160 @@
       669,
       670,
       671,
-      672,
-      673,
-      674,
-      675,
-      676,
-      677,
-      678
+      672
+    ]
+  },
+  {
+    "teal": 382,
+    "source": 94,
+    "pc": [
+      673
+    ]
+  },
+  {
+    "teal": 383,
+    "source": 94,
+    "pc": [
+      674
+    ]
+  },
+  {
+    "teal": 384,
+    "source": 94,
+    "pc": [
+      675
+    ]
+  },
+  {
+    "teal": 385,
+    "source": 94,
+    "pc": [
+      676
     ]
   },
   {
     "teal": 386,
     "source": 94,
     "pc": [
-      679
+      677
     ]
   },
   {
     "teal": 387,
     "source": 94,
     "pc": [
-      680
+      678
     ]
   },
   {
     "teal": 388,
     "source": 94,
     "pc": [
-      681
+      679
     ]
   },
   {
     "teal": 389,
     "source": 94,
     "pc": [
-      682
+      680
     ]
   },
   {
     "teal": 390,
     "source": 94,
     "pc": [
-      683
+      681
     ]
   },
   {
     "teal": 391,
     "source": 94,
     "pc": [
-      684
+      682
     ]
   },
   {
     "teal": 392,
     "source": 94,
     "pc": [
-      685
+      683
     ]
   },
   {
     "teal": 393,
     "source": 94,
     "pc": [
-      686
+      684
     ]
   },
   {
     "teal": 394,
     "source": 94,
     "pc": [
-      687
+      685
     ]
   },
   {
     "teal": 395,
     "source": 94,
     "pc": [
-      688
+      686
     ]
   },
   {
     "teal": 396,
     "source": 94,
     "pc": [
-      689
+      687
     ]
   },
   {
     "teal": 397,
     "source": 94,
     "pc": [
-      690
+      688
     ]
   },
   {
     "teal": 398,
-    "source": 94,
+    "source": 83,
     "pc": [
-      691
+      689
     ]
   },
   {
-    "teal": 399,
-    "source": 94,
+    "teal": 402,
+    "source": 100,
     "pc": [
-      692
+      690
     ]
   },
   {
-    "teal": 400,
-    "source": 94,
+    "teal": 405,
+    "source": 100,
     "pc": [
+      691,
+      692,
       693
     ]
   },
   {
-    "teal": 401,
-    "source": 94,
+    "teal": 406,
+    "source": 100,
     "pc": [
       694
     ]
   },
   {
-    "teal": 402,
-    "source": 83,
+    "teal": 407,
+    "source": 100,
     "pc": [
       695
     ]
   },
   {
-    "teal": 406,
+    "teal": 408,
     "source": 100,
     "pc": [
       696
@@ -2020,170 +2020,170 @@
     "teal": 409,
     "source": 100,
     "pc": [
-      697,
-      698,
-      699
+      697
     ]
   },
   {
     "teal": 410,
     "source": 100,
     "pc": [
-      700
+      698
     ]
   },
   {
     "teal": 411,
     "source": 100,
     "pc": [
-      701
+      699
     ]
   },
   {
     "teal": 412,
     "source": 100,
     "pc": [
-      702
+      700
     ]
   },
   {
     "teal": 413,
     "source": 100,
     "pc": [
-      703
+      701
     ]
   },
   {
     "teal": 414,
     "source": 100,
     "pc": [
-      704
+      702
     ]
   },
   {
     "teal": 415,
     "source": 100,
     "pc": [
-      705
+      703
     ]
   },
   {
     "teal": 416,
     "source": 100,
     "pc": [
-      706
+      704
     ]
   },
   {
     "teal": 417,
     "source": 100,
     "pc": [
-      707
+      705
     ]
   },
   {
     "teal": 418,
     "source": 100,
     "pc": [
-      708
+      706
     ]
   },
   {
     "teal": 419,
     "source": 100,
     "pc": [
-      709
+      707
     ]
   },
   {
     "teal": 420,
     "source": 100,
     "pc": [
-      710
+      708
     ]
   },
   {
     "teal": 421,
     "source": 100,
     "pc": [
-      711
+      709
     ]
   },
   {
     "teal": 422,
     "source": 100,
     "pc": [
-      712
+      710
     ]
   },
   {
     "teal": 423,
     "source": 100,
     "pc": [
-      713
+      711
     ]
   },
   {
-    "teal": 424,
+    "teal": 429,
     "source": 100,
     "pc": [
+      712,
+      713,
       714
     ]
   },
   {
-    "teal": 425,
-    "source": 100,
+    "teal": 433,
+    "source": 102,
     "pc": [
       715
     ]
   },
   {
-    "teal": 426,
-    "source": 100,
+    "teal": 434,
+    "source": 102,
     "pc": [
       716
     ]
   },
   {
-    "teal": 427,
-    "source": 100,
+    "teal": 435,
+    "source": 102,
     "pc": [
       717
     ]
   },
   {
-    "teal": 433,
-    "source": 100,
+    "teal": 439,
+    "source": 108,
     "pc": [
-      718,
-      719,
-      720
+      718
     ]
   },
   {
-    "teal": 437,
-    "source": 102,
+    "teal": 442,
+    "source": 109,
     "pc": [
+      719,
+      720,
       721
     ]
   },
   {
-    "teal": 438,
-    "source": 102,
+    "teal": 443,
+    "source": 109,
     "pc": [
       722
     ]
   },
   {
-    "teal": 439,
-    "source": 102,
+    "teal": 444,
+    "source": 109,
     "pc": [
       723
     ]
   },
   {
-    "teal": 443,
-    "source": 108,
+    "teal": 445,
+    "source": 109,
     "pc": [
       724
     ]
@@ -2192,42 +2192,42 @@
     "teal": 446,
     "source": 109,
     "pc": [
-      725,
-      726,
-      727
+      725
     ]
   },
   {
     "teal": 447,
     "source": 109,
     "pc": [
-      728
+      726
     ]
   },
   {
-    "teal": 448,
-    "source": 109,
+    "teal": 450,
+    "source": 108,
     "pc": [
+      727,
+      728,
       729
     ]
   },
   {
-    "teal": 449,
-    "source": 109,
+    "teal": 451,
+    "source": 108,
     "pc": [
       730
     ]
   },
   {
-    "teal": 450,
-    "source": 109,
+    "teal": 452,
+    "source": 108,
     "pc": [
       731
     ]
   },
   {
-    "teal": 451,
-    "source": 109,
+    "teal": 453,
+    "source": 108,
     "pc": [
       732
     ]
@@ -2236,215 +2236,197 @@
     "teal": 454,
     "source": 108,
     "pc": [
-      733,
-      734,
-      735
+      733
     ]
   },
   {
     "teal": 455,
     "source": 108,
     "pc": [
-      736
+      734
     ]
   },
   {
     "teal": 456,
     "source": 108,
     "pc": [
-      737
+      735
     ]
   },
   {
     "teal": 457,
     "source": 108,
     "pc": [
-      738
+      736
     ]
   },
   {
     "teal": 458,
     "source": 108,
     "pc": [
-      739
+      737
     ]
   },
   {
     "teal": 459,
     "source": 108,
     "pc": [
-      740
+      738
     ]
   },
   {
     "teal": 460,
     "source": 108,
     "pc": [
-      741
+      739
     ]
   },
   {
     "teal": 461,
     "source": 108,
     "pc": [
-      742
+      740
     ]
   },
   {
     "teal": 462,
     "source": 108,
     "pc": [
-      743
+      741
     ]
   },
   {
     "teal": 463,
     "source": 108,
     "pc": [
-      744
+      742
     ]
   },
   {
     "teal": 464,
     "source": 108,
     "pc": [
-      745
+      743
     ]
   },
   {
     "teal": 465,
     "source": 108,
     "pc": [
-      746
+      744
     ]
   },
   {
     "teal": 466,
     "source": 108,
     "pc": [
-      747
+      745
     ]
   },
   {
     "teal": 467,
     "source": 108,
     "pc": [
-      748
+      746
     ]
   },
   {
     "teal": 468,
     "source": 108,
     "pc": [
-      749
+      747
     ]
   },
   {
-    "teal": 469,
+    "teal": 474,
     "source": 108,
     "pc": [
+      748,
+      749,
       750
     ]
   },
   {
-    "teal": 470,
-    "source": 108,
-    "pc": [
-      751
-    ]
-  },
-  {
-    "teal": 471,
-    "source": 108,
+    "teal": 478,
+    "source": 110,
     "pc": [
+      751,
       752
     ]
   },
   {
-    "teal": 472,
-    "source": 108,
+    "teal": 479,
+    "source": 110,
     "pc": [
       753
     ]
   },
-  {
-    "teal": 478,
-    "source": 108,
-    "pc": [
-      754,
-      755,
-      756
-    ]
-  },
   {
     "teal": 482,
-    "source": 110,
+    "source": 9,
     "pc": [
-      757,
-      758
+      754
     ]
   },
   {
     "teal": 483,
-    "source": 110,
+    "source": 9,
     "pc": [
-      759
+      755
     ]
   },
   {
     "teal": 486,
     "source": 9,
     "pc": [
-      760
+      756,
+      757,
+      758,
+      759,
+      760,
+      761
     ]
   },
   {
     "teal": 487,
     "source": 9,
     "pc": [
-      761
+      762,
+      763,
+      764
     ]
   },
   {
-    "teal": 490,
+    "teal": 488,
     "source": 9,
     "pc": [
-      762,
-      763,
-      764,
       765,
       766,
-      767
+      767,
+      768
     ]
   },
   {
-    "teal": 491,
+    "teal": 489,
     "source": 9,
     "pc": [
-      768,
-      769,
-      770
+      769
     ]
   },
   {
     "teal": 492,
     "source": 9,
     "pc": [
+      770,
       771,
       772,
       773,
-      774
-    ]
-  },
-  {
-    "teal": 493,
-    "source": 9,
-    "pc": [
+      774,
       775
     ]
   },
   {
-    "teal": 496,
+    "teal": 493,
     "source": 9,
     "pc": [
       776,
@@ -2456,7 +2438,7 @@
     ]
   },
   {
-    "teal": 497,
+    "teal": 494,
     "source": 9,
     "pc": [
       782,
@@ -2468,7 +2450,7 @@
     ]
   },
   {
-    "teal": 498,
+    "teal": 495,
     "source": 9,
     "pc": [
       788,
@@ -2480,7 +2462,7 @@
     ]
   },
   {
-    "teal": 499,
+    "teal": 496,
     "source": 9,
     "pc": [
       794,
@@ -2492,7 +2474,7 @@
     ]
   },
   {
-    "teal": 500,
+    "teal": 497,
     "source": 9,
     "pc": [
       800,
@@ -2504,7 +2486,7 @@
     ]
   },
   {
-    "teal": 501,
+    "teal": 498,
     "source": 9,
     "pc": [
       806,
@@ -2516,7 +2498,7 @@
     ]
   },
   {
-    "teal": 502,
+    "teal": 499,
     "source": 9,
     "pc": [
       812,
@@ -2528,30 +2510,24 @@
     ]
   },
   {
-    "teal": 503,
+    "teal": 500,
     "source": 9,
     "pc": [
       818,
       819,
-      820,
-      821,
-      822,
-      823
+      820
     ]
   },
   {
-    "teal": 504,
+    "teal": 501,
     "source": 9,
     "pc": [
+      821,
+      822,
+      823,
       824,
       825,
-      826
-    ]
-  },
-  {
-    "teal": 505,
-    "source": 9,
-    "pc": [
+      826,
       827,
       828,
       829,
@@ -2563,20 +2539,14 @@
       835,
       836,
       837,
-      838,
-      839,
-      840,
-      841,
-      842,
-      843,
-      844
+      838
     ]
   },
   {
-    "teal": 506,
+    "teal": 502,
     "source": 9,
     "pc": [
-      845
+      839
     ]
   }
 ]
\ No newline at end of file
diff --git a/examples/arc75/artifacts/ARC75.approval.teal b/examples/arc75/artifacts/ARC75.approval.teal
index d70a92af6..273cfe421 100644
--- a/examples/arc75/artifacts/ARC75.approval.teal
+++ b/examples/arc75/artifacts/ARC75.approval.teal
@@ -175,9 +175,9 @@ addAppToWhiteList:
 	// examples/arc75/arc75.algo.ts:37
 	// this.whitelist(whitelist).value.push(appID)
 	frame_dig 1 // whitelist: Whitelist
-	box_get
-	assert
-	extract 2 0
+	int 2
+	int 0
+	box_extract
 	frame_dig -3 // appID: uint64
 	itob
 	concat
@@ -499,9 +499,9 @@ deleteAppFromWhitelist:
 	// examples/arc75/arc75.algo.ts:97
 	// spliced = this.whitelist(whitelist).value.splice(index, 1)
 	frame_dig 1 // whitelist: Whitelist
-	box_get
-	assert
-	extract 2 0
+	int 2
+	int 0
+	box_extract
 	int 1
 	frame_dig -4 // index: uint64
 	int 8
@@ -510,16 +510,16 @@ deleteAppFromWhitelist:
 	int 16
 	store 246 // splice byte length
 	frame_dig 1 // whitelist: Whitelist
-	box_get
-	assert
-	extract 2 0
+	int 2
+	int 0
+	box_extract
 	int 0
 	load 247 // splice start
 	substring3
 	frame_dig 1 // whitelist: Whitelist
-	box_get
-	assert
-	extract 2 0
+	int 2
+	int 0
+	box_extract
 	dup
 	len
 	load 247 // splice start
@@ -531,9 +531,9 @@ deleteAppFromWhitelist:
 	substring3
 	concat
 	frame_dig 1 // whitelist: Whitelist
-	box_get
-	assert
-	extract 2 0
+	int 2
+	int 0
+	box_extract
 	load 247 // splice start
 	load 246 // splice byte length
 	int 8
diff --git a/examples/arc75/artifacts/ARC75.arc32.json b/examples/arc75/artifacts/ARC75.arc32.json
index 988453ca1..373a9f4f9 100644
--- a/examples/arc75/artifacts/ARC75.arc32.json
+++ b/examples/arc75/artifacts/ARC75.arc32.json
@@ -54,7 +54,7 @@
     }
   },
   "source": {
-    "approval": "#pragma version 9

// This TEAL was generated by TEALScript v0.74.0
// https://github.com/algorandfoundation/TEALScript

// This contract is compliant with and/or implements the following ARCs: [ ARC4 ]

// The following ten lines of TEAL handle initial program flow
// This pattern is used to make it easy for anyone to parse the start of the program and determine if a specific action is allowed
// Here, action refers to the OnComplete in combination with whether the app is being created or called
// Every possible action for this contract is represented in the switch statement
// If the action is not implmented in the contract, its respective branch will be "NOT_IMPLEMENTED" which just contains "err"
txn ApplicationID
!
int 6
*
txn OnCompletion
+
switch call_NoOp NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED create_NoOp NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED

NOT_IMPLEMENTED:
	err

// verifyMBRPayment(uint64,pay)void
verifyMBRPayment:
	proto 2 0

	// examples/arc75/arc75.algo.ts:10
	// verifyPayTxn(payment, {
	//       receiver: this.app.address,
	//       amount: this.app.address.minBalance - preMBR,
	//     })
	// verify receiver
	frame_dig -1 // payment: PayTxn
	gtxns Receiver
	global CurrentApplicationAddress
	==
	assert

	// verify amount
	frame_dig -1 // payment: PayTxn
	gtxns Amount
	global CurrentApplicationAddress
	acct_params_get AcctMinBalance
	assert
	frame_dig -2 // preMBR: uint64
	-
	==
	assert
	retsub

// sendMBRPayment(uint64)void
sendMBRPayment:
	proto 1 0

	// examples/arc75/arc75.algo.ts:17
	// sendPayment({
	//       receiver: this.txn.sender,
	//       amount: preMBR - this.app.address.minBalance,
	//     })
	itxn_begin
	int pay
	itxn_field TypeEnum

	// examples/arc75/arc75.algo.ts:18
	// receiver: this.txn.sender
	txn Sender
	itxn_field Receiver

	// examples/arc75/arc75.algo.ts:19
	// amount: preMBR - this.app.address.minBalance
	frame_dig -1 // preMBR: uint64
	global CurrentApplicationAddress
	acct_params_get AcctMinBalance
	assert
	-
	itxn_field Amount

	// Fee field not set, defaulting to 0
	int 0
	itxn_field Fee

	// Submit inner transaction
	itxn_submit
	retsub

abi_route_addAppToWhiteList:
	// payment: pay
	txn GroupIndex
	int 1
	-
	dup
	gtxns TypeEnum
	int pay
	==
	assert

	// appID: uint64
	txna ApplicationArgs 3
	btoi

	// boxIndex: uint16
	txna ApplicationArgs 2
	dup
	len
	int 2
	==
	assert
	btoi

	// arc: string
	txna ApplicationArgs 1
	extract 2 0

	// execute addAppToWhiteList(pay,uint64,uint16,string)void
	callsub addAppToWhiteList
	int 1
	return

// addAppToWhiteList(pay,uint64,uint16,string)void
//
// Add app to whitelist box
//
// @param arc - The ARC the whitelist corresponds to
// @param boxIndex - The index of the whitelist box to add the app to
// @param appID - The app ID to add to the whitelist
// @param payment - The payment transaction to cover the MBR change
addAppToWhiteList:
	proto 4 0

	// Push empty bytes after the frame pointer to reserve space for local variables
	byte 0x
	dupn 3

	// examples/arc75/arc75.algo.ts:33
	// preMBR = this.app.address.minBalance
	global CurrentApplicationAddress
	acct_params_get AcctMinBalance
	assert
	frame_bury 0 // preMBR: uint64

	// examples/arc75/arc75.algo.ts:34
	// whitelist: Whitelist = { account: this.txn.sender, boxIndex: boxIndex, arc: arc }
	byte 0x // initial head
	byte 0x // initial tail
	byte 0x0024 // initial head offset
	txn Sender
	callsub process_static_tuple_element
	frame_dig -2 // boxIndex: uint16
	itob
	extract 6 2
	callsub process_static_tuple_element
	frame_dig -1 // arc: string
	dup
	len
	itob
	extract 6 2
	swap
	concat
	callsub process_dynamic_tuple_element
	pop // pop head offset
	concat // concat head and tail
	frame_bury 1 // whitelist: Whitelist

	// if0_condition
	// examples/arc75/arc75.algo.ts:36
	// this.whitelist(whitelist).exists
	frame_dig 1 // whitelist: Whitelist
	box_len
	swap
	pop
	bz if0_else

	// if0_consequent
	// examples/arc75/arc75.algo.ts:37
	// this.whitelist(whitelist).value.push(appID)
	frame_dig 1 // whitelist: Whitelist
	box_get
	assert
	extract 2 0
	frame_dig -3 // appID: uint64
	itob
	concat
	frame_dig 1 // whitelist: Whitelist
	dup
	box_del
	pop
	swap
	dup
	len
	int 8
	/
	itob
	extract 6 2
	swap
	concat
	box_put
	b if0_end

if0_else:
	// examples/arc75/arc75.algo.ts:39
	// newWhitelist: uint64[] = [appID]
	frame_dig -3 // appID: uint64
	itob
	frame_bury 2 // newWhitelist: uint64[]

	// examples/arc75/arc75.algo.ts:40
	// this.whitelist(whitelist).value = newWhitelist
	frame_dig 1 // whitelist: Whitelist
	dup
	box_del
	pop
	frame_dig 2 // newWhitelist: uint64[]
	dup
	len
	int 8
	/
	itob
	extract 6 2
	swap
	concat
	box_put

if0_end:
	// examples/arc75/arc75.algo.ts:43
	// this.verifyMBRPayment(payment, preMBR)
	frame_dig 0 // preMBR: uint64
	frame_dig -4 // payment: PayTxn
	callsub verifyMBRPayment
	retsub

abi_route_setAppWhitelist:
	// appIDs: uint64[]
	txna ApplicationArgs 3
	extract 2 0

	// boxIndex: uint16
	txna ApplicationArgs 2
	dup
	len
	int 2
	==
	assert
	btoi

	// arc: string
	txna ApplicationArgs 1
	extract 2 0

	// execute setAppWhitelist(uint64[],uint16,string)void
	callsub setAppWhitelist
	int 1
	return

// setAppWhitelist(uint64[],uint16,string)void
//
// Sets a app whitelist for the sender. Should only be used when adding/removing
// more than one app
//
// @param boxIndex - The index of the whitelist box to put the app IDs in
// @param appIDs - Array of app IDs that signify the whitelisted apps
setAppWhitelist:
	proto 3 0

	// Push empty bytes after the frame pointer to reserve space for local variables
	byte 0x
	dup

	// examples/arc75/arc75.algo.ts:55
	// preMBR = this.app.address.minBalance
	global CurrentApplicationAddress
	acct_params_get AcctMinBalance
	assert
	frame_bury 0 // preMBR: uint64

	// examples/arc75/arc75.algo.ts:56
	// whitelist: Whitelist = { account: this.txn.sender, boxIndex: boxIndex, arc: arc }
	byte 0x // initial head
	byte 0x // initial tail
	byte 0x0024 // initial head offset
	txn Sender
	callsub process_static_tuple_element
	frame_dig -2 // boxIndex: uint16
	itob
	extract 6 2
	callsub process_static_tuple_element
	frame_dig -1 // arc: string
	dup
	len
	itob
	extract 6 2
	swap
	concat
	callsub process_dynamic_tuple_element
	pop // pop head offset
	concat // concat head and tail
	frame_bury 1 // whitelist: Whitelist

	// examples/arc75/arc75.algo.ts:58
	// this.whitelist(whitelist).delete()
	frame_dig 1 // whitelist: Whitelist
	box_del

	// examples/arc75/arc75.algo.ts:60
	// this.whitelist(whitelist).value = appIDs
	frame_dig 1 // whitelist: Whitelist
	dup
	box_del
	pop
	frame_dig -3 // appIDs: uint64[]
	dup
	len
	int 8
	/
	itob
	extract 6 2
	swap
	concat
	box_put

	// if1_condition
	// examples/arc75/arc75.algo.ts:62
	// preMBR > this.app.address.minBalance
	frame_dig 0 // preMBR: uint64
	global CurrentApplicationAddress
	acct_params_get AcctMinBalance
	assert
	>
	bz if1_else

	// if1_consequent
	// examples/arc75/arc75.algo.ts:63
	// this.sendMBRPayment(preMBR)
	frame_dig 0 // preMBR: uint64
	callsub sendMBRPayment
	b if1_end

if1_else:
	// examples/arc75/arc75.algo.ts:65
	// this.verifyMBRPayment(this.txnGroup[this.txn.groupIndex - 1] as PayTxn, preMBR)
	frame_dig 0 // preMBR: uint64
	txn GroupIndex
	int 1
	-
	dup
	gtxns TypeEnum
	int pay
	==
	assert
	callsub verifyMBRPayment

if1_end:
	retsub

abi_route_deleteWhitelist:
	// boxIndex: uint16
	txna ApplicationArgs 2
	dup
	len
	int 2
	==
	assert
	btoi

	// arc: string
	txna ApplicationArgs 1
	extract 2 0

	// execute deleteWhitelist(uint16,string)void
	callsub deleteWhitelist
	int 1
	return

// deleteWhitelist(uint16,string)void
//
// Deletes a app whitelist for the sender
//
// @param arc - The ARC the whitelist corresponds to
// @param boxIndex - The index of the whitelist box to delete
deleteWhitelist:
	proto 2 0

	// Push empty bytes after the frame pointer to reserve space for local variables
	byte 0x
	dup

	// examples/arc75/arc75.algo.ts:77
	// preMBR = this.app.address.minBalance
	global CurrentApplicationAddress
	acct_params_get AcctMinBalance
	assert
	frame_bury 0 // preMBR: uint64

	// examples/arc75/arc75.algo.ts:78
	// whitelist: Whitelist = { account: this.txn.sender, boxIndex: boxIndex, arc: arc }
	byte 0x // initial head
	byte 0x // initial tail
	byte 0x0024 // initial head offset
	txn Sender
	callsub process_static_tuple_element
	frame_dig -2 // boxIndex: uint16
	itob
	extract 6 2
	callsub process_static_tuple_element
	frame_dig -1 // arc: string
	dup
	len
	itob
	extract 6 2
	swap
	concat
	callsub process_dynamic_tuple_element
	pop // pop head offset
	concat // concat head and tail
	frame_bury 1 // whitelist: Whitelist

	// examples/arc75/arc75.algo.ts:80
	// this.whitelist(whitelist).delete()
	frame_dig 1 // whitelist: Whitelist
	box_del

	// examples/arc75/arc75.algo.ts:82
	// this.sendMBRPayment(preMBR)
	frame_dig 0 // preMBR: uint64
	callsub sendMBRPayment
	retsub

abi_route_deleteAppFromWhitelist:
	// index: uint64
	txna ApplicationArgs 4
	btoi

	// appID: uint64
	txna ApplicationArgs 3
	btoi

	// boxIndex: uint16
	txna ApplicationArgs 2
	dup
	len
	int 2
	==
	assert
	btoi

	// arc: string
	txna ApplicationArgs 1
	extract 2 0

	// execute deleteAppFromWhitelist(uint64,uint64,uint16,string)void
	callsub deleteAppFromWhitelist
	int 1
	return

// deleteAppFromWhitelist(uint64,uint64,uint16,string)void
//
// Deletes a app from a whitelist for the sender
//
// @param boxIndex - The index of the whitelist box to delete from
// @param appID - The app ID to delete from the whitelist
// @param index - The index of the app in the whitelist
deleteAppFromWhitelist:
	proto 4 0

	// Push empty bytes after the frame pointer to reserve space for local variables
	byte 0x
	dupn 3

	// examples/arc75/arc75.algo.ts:94
	// preMBR = this.app.address.minBalance
	global CurrentApplicationAddress
	acct_params_get AcctMinBalance
	assert
	frame_bury 0 // preMBR: uint64

	// examples/arc75/arc75.algo.ts:95
	// whitelist: Whitelist = { account: this.txn.sender, boxIndex: boxIndex, arc: arc }
	byte 0x // initial head
	byte 0x // initial tail
	byte 0x0024 // initial head offset
	txn Sender
	callsub process_static_tuple_element
	frame_dig -2 // boxIndex: uint16
	itob
	extract 6 2
	callsub process_static_tuple_element
	frame_dig -1 // arc: string
	dup
	len
	itob
	extract 6 2
	swap
	concat
	callsub process_dynamic_tuple_element
	pop // pop head offset
	concat // concat head and tail
	frame_bury 1 // whitelist: Whitelist

	// examples/arc75/arc75.algo.ts:97
	// spliced = this.whitelist(whitelist).value.splice(index, 1)
	frame_dig 1 // whitelist: Whitelist
	box_get
	assert
	extract 2 0
	int 1
	frame_dig -4 // index: uint64
	int 8
	*
	store 247 // splice start
	int 16
	store 246 // splice byte length
	frame_dig 1 // whitelist: Whitelist
	box_get
	assert
	extract 2 0
	int 0
	load 247 // splice start
	substring3
	frame_dig 1 // whitelist: Whitelist
	box_get
	assert
	extract 2 0
	dup
	len
	load 247 // splice start
	load 246 // splice byte length
	+
	int 8
	-
	swap
	substring3
	concat
	frame_dig 1 // whitelist: Whitelist
	box_get
	assert
	extract 2 0
	load 247 // splice start
	load 246 // splice byte length
	int 8
	-
	extract3
	swap
	frame_dig 1 // whitelist: Whitelist
	dup
	box_del
	pop
	swap
	dup
	len
	int 8
	/
	itob
	extract 6 2
	swap
	concat
	box_put
	frame_bury 2 // spliced: uint64[]

	// examples/arc75/arc75.algo.ts:99
	// assert(spliced[0] === appID)
	frame_dig 2 // spliced: uint64[]
	store 255 // full array
	load 255 // full array
	extract 0 8
	btoi
	frame_dig -3 // appID: uint64
	==
	assert

	// examples/arc75/arc75.algo.ts:101
	// this.sendMBRPayment(preMBR)
	frame_dig 0 // preMBR: uint64
	callsub sendMBRPayment
	retsub

abi_route_createApplication:
	int 1
	return

create_NoOp:
	method "createApplication()void"
	txna ApplicationArgs 0
	match abi_route_createApplication
	err

call_NoOp:
	method "addAppToWhiteList(string,uint16,uint64,pay)void"
	method "setAppWhitelist(string,uint16,uint64[])void"
	method "deleteWhitelist(string,uint16)void"
	method "deleteAppFromWhitelist(string,uint16,uint64,uint64)void"
	txna ApplicationArgs 0
	match abi_route_addAppToWhiteList abi_route_setAppWhitelist abi_route_deleteWhitelist abi_route_deleteAppFromWhitelist
	err

process_static_tuple_element:
	proto 4 3
	frame_dig -4 // tuple head
	frame_dig -1 // element
	concat
	frame_dig -3 // tuple tail
	frame_dig -2 // head offset
	retsub

process_dynamic_tuple_element:
	proto 4 3
	frame_dig -4 // tuple head
	frame_dig -2 // head offset
	concat
	frame_bury -4 // tuple head
	frame_dig -1 // element
	dup
	len
	frame_dig -2 // head offset
	btoi
	+
	itob
	extract 6 2
	frame_bury -2 // head offset
	frame_dig -3 // tuple tail
	swap
	concat
	frame_bury -3 // tuple tail
	frame_dig -4 // tuple head
	frame_dig -3 // tuple tail
	frame_dig -2 // head offset
	retsub",
+    "approval": "#pragma version 9

// This TEAL was generated by TEALScript v0.74.0
// https://github.com/algorandfoundation/TEALScript

// This contract is compliant with and/or implements the following ARCs: [ ARC4 ]

// The following ten lines of TEAL handle initial program flow
// This pattern is used to make it easy for anyone to parse the start of the program and determine if a specific action is allowed
// Here, action refers to the OnComplete in combination with whether the app is being created or called
// Every possible action for this contract is represented in the switch statement
// If the action is not implmented in the contract, its respective branch will be "NOT_IMPLEMENTED" which just contains "err"
txn ApplicationID
!
int 6
*
txn OnCompletion
+
switch call_NoOp NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED create_NoOp NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED

NOT_IMPLEMENTED:
	err

// verifyMBRPayment(uint64,pay)void
verifyMBRPayment:
	proto 2 0

	// examples/arc75/arc75.algo.ts:10
	// verifyPayTxn(payment, {
	//       receiver: this.app.address,
	//       amount: this.app.address.minBalance - preMBR,
	//     })
	// verify receiver
	frame_dig -1 // payment: PayTxn
	gtxns Receiver
	global CurrentApplicationAddress
	==
	assert

	// verify amount
	frame_dig -1 // payment: PayTxn
	gtxns Amount
	global CurrentApplicationAddress
	acct_params_get AcctMinBalance
	assert
	frame_dig -2 // preMBR: uint64
	-
	==
	assert
	retsub

// sendMBRPayment(uint64)void
sendMBRPayment:
	proto 1 0

	// examples/arc75/arc75.algo.ts:17
	// sendPayment({
	//       receiver: this.txn.sender,
	//       amount: preMBR - this.app.address.minBalance,
	//     })
	itxn_begin
	int pay
	itxn_field TypeEnum

	// examples/arc75/arc75.algo.ts:18
	// receiver: this.txn.sender
	txn Sender
	itxn_field Receiver

	// examples/arc75/arc75.algo.ts:19
	// amount: preMBR - this.app.address.minBalance
	frame_dig -1 // preMBR: uint64
	global CurrentApplicationAddress
	acct_params_get AcctMinBalance
	assert
	-
	itxn_field Amount

	// Fee field not set, defaulting to 0
	int 0
	itxn_field Fee

	// Submit inner transaction
	itxn_submit
	retsub

abi_route_addAppToWhiteList:
	// payment: pay
	txn GroupIndex
	int 1
	-
	dup
	gtxns TypeEnum
	int pay
	==
	assert

	// appID: uint64
	txna ApplicationArgs 3
	btoi

	// boxIndex: uint16
	txna ApplicationArgs 2
	dup
	len
	int 2
	==
	assert
	btoi

	// arc: string
	txna ApplicationArgs 1
	extract 2 0

	// execute addAppToWhiteList(pay,uint64,uint16,string)void
	callsub addAppToWhiteList
	int 1
	return

// addAppToWhiteList(pay,uint64,uint16,string)void
//
// Add app to whitelist box
//
// @param arc - The ARC the whitelist corresponds to
// @param boxIndex - The index of the whitelist box to add the app to
// @param appID - The app ID to add to the whitelist
// @param payment - The payment transaction to cover the MBR change
addAppToWhiteList:
	proto 4 0

	// Push empty bytes after the frame pointer to reserve space for local variables
	byte 0x
	dupn 3

	// examples/arc75/arc75.algo.ts:33
	// preMBR = this.app.address.minBalance
	global CurrentApplicationAddress
	acct_params_get AcctMinBalance
	assert
	frame_bury 0 // preMBR: uint64

	// examples/arc75/arc75.algo.ts:34
	// whitelist: Whitelist = { account: this.txn.sender, boxIndex: boxIndex, arc: arc }
	byte 0x // initial head
	byte 0x // initial tail
	byte 0x0024 // initial head offset
	txn Sender
	callsub process_static_tuple_element
	frame_dig -2 // boxIndex: uint16
	itob
	extract 6 2
	callsub process_static_tuple_element
	frame_dig -1 // arc: string
	dup
	len
	itob
	extract 6 2
	swap
	concat
	callsub process_dynamic_tuple_element
	pop // pop head offset
	concat // concat head and tail
	frame_bury 1 // whitelist: Whitelist

	// if0_condition
	// examples/arc75/arc75.algo.ts:36
	// this.whitelist(whitelist).exists
	frame_dig 1 // whitelist: Whitelist
	box_len
	swap
	pop
	bz if0_else

	// if0_consequent
	// examples/arc75/arc75.algo.ts:37
	// this.whitelist(whitelist).value.push(appID)
	frame_dig 1 // whitelist: Whitelist
	int 2
	int 0
	box_extract
	frame_dig -3 // appID: uint64
	itob
	concat
	frame_dig 1 // whitelist: Whitelist
	dup
	box_del
	pop
	swap
	dup
	len
	int 8
	/
	itob
	extract 6 2
	swap
	concat
	box_put
	b if0_end

if0_else:
	// examples/arc75/arc75.algo.ts:39
	// newWhitelist: uint64[] = [appID]
	frame_dig -3 // appID: uint64
	itob
	frame_bury 2 // newWhitelist: uint64[]

	// examples/arc75/arc75.algo.ts:40
	// this.whitelist(whitelist).value = newWhitelist
	frame_dig 1 // whitelist: Whitelist
	dup
	box_del
	pop
	frame_dig 2 // newWhitelist: uint64[]
	dup
	len
	int 8
	/
	itob
	extract 6 2
	swap
	concat
	box_put

if0_end:
	// examples/arc75/arc75.algo.ts:43
	// this.verifyMBRPayment(payment, preMBR)
	frame_dig 0 // preMBR: uint64
	frame_dig -4 // payment: PayTxn
	callsub verifyMBRPayment
	retsub

abi_route_setAppWhitelist:
	// appIDs: uint64[]
	txna ApplicationArgs 3
	extract 2 0

	// boxIndex: uint16
	txna ApplicationArgs 2
	dup
	len
	int 2
	==
	assert
	btoi

	// arc: string
	txna ApplicationArgs 1
	extract 2 0

	// execute setAppWhitelist(uint64[],uint16,string)void
	callsub setAppWhitelist
	int 1
	return

// setAppWhitelist(uint64[],uint16,string)void
//
// Sets a app whitelist for the sender. Should only be used when adding/removing
// more than one app
//
// @param boxIndex - The index of the whitelist box to put the app IDs in
// @param appIDs - Array of app IDs that signify the whitelisted apps
setAppWhitelist:
	proto 3 0

	// Push empty bytes after the frame pointer to reserve space for local variables
	byte 0x
	dup

	// examples/arc75/arc75.algo.ts:55
	// preMBR = this.app.address.minBalance
	global CurrentApplicationAddress
	acct_params_get AcctMinBalance
	assert
	frame_bury 0 // preMBR: uint64

	// examples/arc75/arc75.algo.ts:56
	// whitelist: Whitelist = { account: this.txn.sender, boxIndex: boxIndex, arc: arc }
	byte 0x // initial head
	byte 0x // initial tail
	byte 0x0024 // initial head offset
	txn Sender
	callsub process_static_tuple_element
	frame_dig -2 // boxIndex: uint16
	itob
	extract 6 2
	callsub process_static_tuple_element
	frame_dig -1 // arc: string
	dup
	len
	itob
	extract 6 2
	swap
	concat
	callsub process_dynamic_tuple_element
	pop // pop head offset
	concat // concat head and tail
	frame_bury 1 // whitelist: Whitelist

	// examples/arc75/arc75.algo.ts:58
	// this.whitelist(whitelist).delete()
	frame_dig 1 // whitelist: Whitelist
	box_del

	// examples/arc75/arc75.algo.ts:60
	// this.whitelist(whitelist).value = appIDs
	frame_dig 1 // whitelist: Whitelist
	dup
	box_del
	pop
	frame_dig -3 // appIDs: uint64[]
	dup
	len
	int 8
	/
	itob
	extract 6 2
	swap
	concat
	box_put

	// if1_condition
	// examples/arc75/arc75.algo.ts:62
	// preMBR > this.app.address.minBalance
	frame_dig 0 // preMBR: uint64
	global CurrentApplicationAddress
	acct_params_get AcctMinBalance
	assert
	>
	bz if1_else

	// if1_consequent
	// examples/arc75/arc75.algo.ts:63
	// this.sendMBRPayment(preMBR)
	frame_dig 0 // preMBR: uint64
	callsub sendMBRPayment
	b if1_end

if1_else:
	// examples/arc75/arc75.algo.ts:65
	// this.verifyMBRPayment(this.txnGroup[this.txn.groupIndex - 1] as PayTxn, preMBR)
	frame_dig 0 // preMBR: uint64
	txn GroupIndex
	int 1
	-
	dup
	gtxns TypeEnum
	int pay
	==
	assert
	callsub verifyMBRPayment

if1_end:
	retsub

abi_route_deleteWhitelist:
	// boxIndex: uint16
	txna ApplicationArgs 2
	dup
	len
	int 2
	==
	assert
	btoi

	// arc: string
	txna ApplicationArgs 1
	extract 2 0

	// execute deleteWhitelist(uint16,string)void
	callsub deleteWhitelist
	int 1
	return

// deleteWhitelist(uint16,string)void
//
// Deletes a app whitelist for the sender
//
// @param arc - The ARC the whitelist corresponds to
// @param boxIndex - The index of the whitelist box to delete
deleteWhitelist:
	proto 2 0

	// Push empty bytes after the frame pointer to reserve space for local variables
	byte 0x
	dup

	// examples/arc75/arc75.algo.ts:77
	// preMBR = this.app.address.minBalance
	global CurrentApplicationAddress
	acct_params_get AcctMinBalance
	assert
	frame_bury 0 // preMBR: uint64

	// examples/arc75/arc75.algo.ts:78
	// whitelist: Whitelist = { account: this.txn.sender, boxIndex: boxIndex, arc: arc }
	byte 0x // initial head
	byte 0x // initial tail
	byte 0x0024 // initial head offset
	txn Sender
	callsub process_static_tuple_element
	frame_dig -2 // boxIndex: uint16
	itob
	extract 6 2
	callsub process_static_tuple_element
	frame_dig -1 // arc: string
	dup
	len
	itob
	extract 6 2
	swap
	concat
	callsub process_dynamic_tuple_element
	pop // pop head offset
	concat // concat head and tail
	frame_bury 1 // whitelist: Whitelist

	// examples/arc75/arc75.algo.ts:80
	// this.whitelist(whitelist).delete()
	frame_dig 1 // whitelist: Whitelist
	box_del

	// examples/arc75/arc75.algo.ts:82
	// this.sendMBRPayment(preMBR)
	frame_dig 0 // preMBR: uint64
	callsub sendMBRPayment
	retsub

abi_route_deleteAppFromWhitelist:
	// index: uint64
	txna ApplicationArgs 4
	btoi

	// appID: uint64
	txna ApplicationArgs 3
	btoi

	// boxIndex: uint16
	txna ApplicationArgs 2
	dup
	len
	int 2
	==
	assert
	btoi

	// arc: string
	txna ApplicationArgs 1
	extract 2 0

	// execute deleteAppFromWhitelist(uint64,uint64,uint16,string)void
	callsub deleteAppFromWhitelist
	int 1
	return

// deleteAppFromWhitelist(uint64,uint64,uint16,string)void
//
// Deletes a app from a whitelist for the sender
//
// @param boxIndex - The index of the whitelist box to delete from
// @param appID - The app ID to delete from the whitelist
// @param index - The index of the app in the whitelist
deleteAppFromWhitelist:
	proto 4 0

	// Push empty bytes after the frame pointer to reserve space for local variables
	byte 0x
	dupn 3

	// examples/arc75/arc75.algo.ts:94
	// preMBR = this.app.address.minBalance
	global CurrentApplicationAddress
	acct_params_get AcctMinBalance
	assert
	frame_bury 0 // preMBR: uint64

	// examples/arc75/arc75.algo.ts:95
	// whitelist: Whitelist = { account: this.txn.sender, boxIndex: boxIndex, arc: arc }
	byte 0x // initial head
	byte 0x // initial tail
	byte 0x0024 // initial head offset
	txn Sender
	callsub process_static_tuple_element
	frame_dig -2 // boxIndex: uint16
	itob
	extract 6 2
	callsub process_static_tuple_element
	frame_dig -1 // arc: string
	dup
	len
	itob
	extract 6 2
	swap
	concat
	callsub process_dynamic_tuple_element
	pop // pop head offset
	concat // concat head and tail
	frame_bury 1 // whitelist: Whitelist

	// examples/arc75/arc75.algo.ts:97
	// spliced = this.whitelist(whitelist).value.splice(index, 1)
	frame_dig 1 // whitelist: Whitelist
	int 2
	int 0
	box_extract
	int 1
	frame_dig -4 // index: uint64
	int 8
	*
	store 247 // splice start
	int 16
	store 246 // splice byte length
	frame_dig 1 // whitelist: Whitelist
	int 2
	int 0
	box_extract
	int 0
	load 247 // splice start
	substring3
	frame_dig 1 // whitelist: Whitelist
	int 2
	int 0
	box_extract
	dup
	len
	load 247 // splice start
	load 246 // splice byte length
	+
	int 8
	-
	swap
	substring3
	concat
	frame_dig 1 // whitelist: Whitelist
	int 2
	int 0
	box_extract
	load 247 // splice start
	load 246 // splice byte length
	int 8
	-
	extract3
	swap
	frame_dig 1 // whitelist: Whitelist
	dup
	box_del
	pop
	swap
	dup
	len
	int 8
	/
	itob
	extract 6 2
	swap
	concat
	box_put
	frame_bury 2 // spliced: uint64[]

	// examples/arc75/arc75.algo.ts:99
	// assert(spliced[0] === appID)
	frame_dig 2 // spliced: uint64[]
	store 255 // full array
	load 255 // full array
	extract 0 8
	btoi
	frame_dig -3 // appID: uint64
	==
	assert

	// examples/arc75/arc75.algo.ts:101
	// this.sendMBRPayment(preMBR)
	frame_dig 0 // preMBR: uint64
	callsub sendMBRPayment
	retsub

abi_route_createApplication:
	int 1
	return

create_NoOp:
	method "createApplication()void"
	txna ApplicationArgs 0
	match abi_route_createApplication
	err

call_NoOp:
	method "addAppToWhiteList(string,uint16,uint64,pay)void"
	method "setAppWhitelist(string,uint16,uint64[])void"
	method "deleteWhitelist(string,uint16)void"
	method "deleteAppFromWhitelist(string,uint16,uint64,uint64)void"
	txna ApplicationArgs 0
	match abi_route_addAppToWhiteList abi_route_setAppWhitelist abi_route_deleteWhitelist abi_route_deleteAppFromWhitelist
	err

process_static_tuple_element:
	proto 4 3
	frame_dig -4 // tuple head
	frame_dig -1 // element
	concat
	frame_dig -3 // tuple tail
	frame_dig -2 // head offset
	retsub

process_dynamic_tuple_element:
	proto 4 3
	frame_dig -4 // tuple head
	frame_dig -2 // head offset
	concat
	frame_bury -4 // tuple head
	frame_dig -1 // element
	dup
	len
	frame_dig -2 // head offset
	btoi
	+
	itob
	extract 6 2
	frame_bury -2 // head offset
	frame_dig -3 // tuple tail
	swap
	concat
	frame_bury -3 // tuple tail
	frame_dig -4 // tuple head
	frame_dig -3 // tuple tail
	frame_dig -2 // head offset
	retsub",
     "clear": "I3ByYWdtYSB2ZXJzaW9uIDk="
   },
   "contract": {
diff --git a/examples/arc75/artifacts/ARC75.src_map.json b/examples/arc75/artifacts/ARC75.src_map.json
index bce942eb8..329a2537d 100644
--- a/examples/arc75/artifacts/ARC75.src_map.json
+++ b/examples/arc75/artifacts/ARC75.src_map.json
@@ -785,2426 +785,2416 @@
     "teal": 180,
     "source": 37,
     "pc": [
-      194,
-      195,
-      196
+      194
     ]
   },
   {
     "teal": 181,
     "source": 37,
     "pc": [
-      197,
-      198
+      195,
+      196
     ]
   },
   {
     "teal": 182,
     "source": 37,
     "pc": [
-      199
+      197
     ]
   },
   {
     "teal": 183,
     "source": 37,
     "pc": [
-      200
+      198
     ]
   },
   {
     "teal": 184,
     "source": 37,
     "pc": [
-      201,
-      202
+      199,
+      200
     ]
   },
   {
     "teal": 185,
     "source": 37,
     "pc": [
-      203
+      201
     ]
   },
   {
     "teal": 186,
     "source": 37,
     "pc": [
-      204
+      202
     ]
   },
   {
     "teal": 187,
     "source": 37,
     "pc": [
-      205
+      203
     ]
   },
   {
     "teal": 188,
     "source": 37,
     "pc": [
-      206
+      204
     ]
   },
   {
     "teal": 189,
     "source": 37,
     "pc": [
-      207
+      205
     ]
   },
   {
     "teal": 190,
     "source": 37,
     "pc": [
-      208
+      206
     ]
   },
   {
     "teal": 191,
     "source": 37,
     "pc": [
-      209
+      207
     ]
   },
   {
     "teal": 192,
     "source": 37,
     "pc": [
-      210
+      208
     ]
   },
   {
     "teal": 193,
     "source": 37,
     "pc": [
-      211
+      209
     ]
   },
   {
     "teal": 194,
     "source": 37,
     "pc": [
-      212,
-      213,
-      214
+      210,
+      211,
+      212
     ]
   },
   {
     "teal": 195,
     "source": 37,
     "pc": [
-      215
+      213
     ]
   },
   {
     "teal": 196,
     "source": 37,
     "pc": [
-      216
+      214
     ]
   },
   {
     "teal": 197,
     "source": 37,
     "pc": [
-      217
+      215
     ]
   },
   {
     "teal": 198,
     "source": 36,
     "pc": [
-      218,
-      219,
-      220
+      216,
+      217,
+      218
     ]
   },
   {
     "teal": 203,
     "source": 39,
     "pc": [
-      221,
-      222
+      219,
+      220
     ]
   },
   {
     "teal": 204,
     "source": 39,
     "pc": [
-      223
+      221
     ]
   },
   {
     "teal": 205,
     "source": 39,
     "pc": [
-      224,
-      225
+      222,
+      223
     ]
   },
   {
     "teal": 209,
     "source": 40,
     "pc": [
-      226,
-      227
+      224,
+      225
     ]
   },
   {
     "teal": 210,
     "source": 40,
     "pc": [
-      228
+      226
     ]
   },
   {
     "teal": 211,
     "source": 40,
     "pc": [
-      229
+      227
     ]
   },
   {
     "teal": 212,
     "source": 40,
     "pc": [
-      230
+      228
     ]
   },
   {
     "teal": 213,
     "source": 40,
     "pc": [
-      231,
-      232
+      229,
+      230
     ]
   },
   {
     "teal": 214,
     "source": 40,
     "pc": [
-      233
+      231
     ]
   },
   {
     "teal": 215,
     "source": 40,
     "pc": [
-      234
+      232
     ]
   },
   {
     "teal": 216,
     "source": 40,
     "pc": [
-      235
+      233
     ]
   },
   {
     "teal": 217,
     "source": 40,
     "pc": [
-      236
+      234
     ]
   },
   {
     "teal": 218,
     "source": 40,
     "pc": [
-      237
+      235
     ]
   },
   {
     "teal": 219,
     "source": 40,
     "pc": [
-      238,
-      239,
-      240
+      236,
+      237,
+      238
     ]
   },
   {
     "teal": 220,
     "source": 40,
     "pc": [
-      241
+      239
     ]
   },
   {
     "teal": 221,
     "source": 40,
     "pc": [
-      242
+      240
     ]
   },
   {
     "teal": 222,
     "source": 40,
     "pc": [
-      243
+      241
     ]
   },
   {
     "teal": 227,
     "source": 43,
     "pc": [
-      244,
-      245
+      242,
+      243
     ]
   },
   {
     "teal": 228,
     "source": 43,
     "pc": [
-      246,
-      247
+      244,
+      245
     ]
   },
   {
     "teal": 229,
     "source": 43,
     "pc": [
-      248,
-      249,
-      250
+      246,
+      247,
+      248
     ]
   },
   {
     "teal": 230,
     "source": 32,
     "pc": [
-      251
+      249
     ]
   },
   {
     "teal": 234,
     "source": 54,
     "pc": [
-      252,
-      253,
-      254
+      250,
+      251,
+      252
     ]
   },
   {
     "teal": 235,
     "source": 54,
     "pc": [
-      255,
-      256,
-      257
+      253,
+      254,
+      255
     ]
   },
   {
     "teal": 238,
     "source": 54,
     "pc": [
-      258,
-      259,
-      260
+      256,
+      257,
+      258
     ]
   },
   {
     "teal": 239,
     "source": 54,
     "pc": [
-      261
+      259
     ]
   },
   {
     "teal": 240,
     "source": 54,
     "pc": [
-      262
+      260
     ]
   },
   {
     "teal": 241,
     "source": 54,
     "pc": [
-      263
+      261
     ]
   },
   {
     "teal": 242,
     "source": 54,
     "pc": [
-      264
+      262
     ]
   },
   {
     "teal": 243,
     "source": 54,
     "pc": [
-      265
+      263
     ]
   },
   {
     "teal": 244,
     "source": 54,
     "pc": [
-      266
+      264
     ]
   },
   {
     "teal": 247,
     "source": 54,
     "pc": [
-      267,
-      268,
-      269
+      265,
+      266,
+      267
     ]
   },
   {
     "teal": 248,
     "source": 54,
     "pc": [
-      270,
-      271,
-      272
+      268,
+      269,
+      270
     ]
   },
   {
     "teal": 251,
     "source": 54,
     "pc": [
-      273,
-      274,
-      275
+      271,
+      272,
+      273
     ]
   },
   {
     "teal": 252,
     "source": 54,
     "pc": [
-      276
+      274
     ]
   },
   {
     "teal": 253,
     "source": 54,
     "pc": [
-      277
+      275
     ]
   },
   {
     "teal": 263,
     "source": 54,
     "pc": [
-      278,
-      279,
-      280
+      276,
+      277,
+      278
     ]
   },
   {
     "teal": 266,
     "source": 54,
     "pc": [
-      281
+      279
     ]
   },
   {
     "teal": 267,
     "source": 54,
     "pc": [
-      282
+      280
     ]
   },
   {
     "teal": 271,
     "source": 55,
     "pc": [
-      283,
-      284
+      281,
+      282
     ]
   },
   {
     "teal": 272,
     "source": 55,
     "pc": [
-      285,
-      286
+      283,
+      284
     ]
   },
   {
     "teal": 273,
     "source": 55,
     "pc": [
-      287
+      285
     ]
   },
   {
     "teal": 274,
     "source": 55,
     "pc": [
-      288,
-      289
+      286,
+      287
     ]
   },
   {
     "teal": 278,
     "source": 56,
     "pc": [
-      290
+      288
     ]
   },
   {
     "teal": 279,
     "source": 56,
     "pc": [
-      291
+      289
     ]
   },
   {
     "teal": 280,
     "source": 56,
     "pc": [
-      292
+      290
     ]
   },
   {
     "teal": 281,
     "source": 56,
     "pc": [
-      293,
-      294
+      291,
+      292
     ]
   },
   {
     "teal": 282,
     "source": 56,
     "pc": [
-      295,
-      296,
-      297
+      293,
+      294,
+      295
     ]
   },
   {
     "teal": 283,
     "source": 56,
     "pc": [
-      298,
-      299
+      296,
+      297
     ]
   },
   {
     "teal": 284,
     "source": 56,
     "pc": [
-      300
+      298
     ]
   },
   {
     "teal": 285,
     "source": 56,
     "pc": [
-      301,
-      302,
-      303
+      299,
+      300,
+      301
     ]
   },
   {
     "teal": 286,
     "source": 56,
     "pc": [
-      304,
-      305,
-      306
+      302,
+      303,
+      304
     ]
   },
   {
     "teal": 287,
     "source": 56,
     "pc": [
-      307,
-      308
+      305,
+      306
     ]
   },
   {
     "teal": 288,
     "source": 56,
     "pc": [
-      309
+      307
     ]
   },
   {
     "teal": 289,
     "source": 56,
     "pc": [
-      310
+      308
     ]
   },
   {
     "teal": 290,
     "source": 56,
     "pc": [
-      311
+      309
     ]
   },
   {
     "teal": 291,
     "source": 56,
     "pc": [
-      312,
-      313,
-      314
+      310,
+      311,
+      312
     ]
   },
   {
     "teal": 292,
     "source": 56,
     "pc": [
-      315
+      313
     ]
   },
   {
     "teal": 293,
     "source": 56,
     "pc": [
-      316
+      314
     ]
   },
   {
     "teal": 294,
     "source": 56,
     "pc": [
-      317,
-      318,
-      319
+      315,
+      316,
+      317
     ]
   },
   {
     "teal": 295,
     "source": 56,
     "pc": [
-      320
+      318
     ]
   },
   {
     "teal": 296,
     "source": 56,
     "pc": [
-      321
+      319
     ]
   },
   {
     "teal": 297,
     "source": 56,
     "pc": [
-      322,
-      323
+      320,
+      321
     ]
   },
   {
     "teal": 301,
     "source": 58,
     "pc": [
-      324,
-      325
+      322,
+      323
     ]
   },
   {
     "teal": 302,
     "source": 58,
     "pc": [
-      326
+      324
     ]
   },
   {
     "teal": 306,
     "source": 60,
     "pc": [
-      327,
-      328
+      325,
+      326
     ]
   },
   {
     "teal": 307,
     "source": 60,
     "pc": [
-      329
+      327
     ]
   },
   {
     "teal": 308,
     "source": 60,
     "pc": [
-      330
+      328
     ]
   },
   {
     "teal": 309,
     "source": 60,
     "pc": [
-      331
+      329
     ]
   },
   {
     "teal": 310,
     "source": 60,
     "pc": [
-      332,
-      333
+      330,
+      331
     ]
   },
   {
     "teal": 311,
     "source": 60,
     "pc": [
-      334
+      332
     ]
   },
   {
     "teal": 312,
     "source": 60,
     "pc": [
-      335
+      333
     ]
   },
   {
     "teal": 313,
     "source": 60,
     "pc": [
-      336
+      334
     ]
   },
   {
     "teal": 314,
     "source": 60,
     "pc": [
-      337
+      335
     ]
   },
   {
     "teal": 315,
     "source": 60,
     "pc": [
-      338
+      336
     ]
   },
   {
     "teal": 316,
     "source": 60,
     "pc": [
-      339,
-      340,
-      341
+      337,
+      338,
+      339
     ]
   },
   {
     "teal": 317,
     "source": 60,
     "pc": [
-      342
+      340
     ]
   },
   {
     "teal": 318,
     "source": 60,
     "pc": [
-      343
+      341
     ]
   },
   {
     "teal": 319,
     "source": 60,
     "pc": [
-      344
+      342
     ]
   },
   {
     "teal": 324,
     "source": 62,
     "pc": [
-      345,
-      346
+      343,
+      344
     ]
   },
   {
     "teal": 325,
     "source": 62,
     "pc": [
-      347,
-      348
+      345,
+      346
     ]
   },
   {
     "teal": 326,
     "source": 62,
     "pc": [
-      349,
-      350
+      347,
+      348
     ]
   },
   {
     "teal": 327,
     "source": 62,
     "pc": [
-      351
+      349
     ]
   },
   {
     "teal": 328,
     "source": 62,
     "pc": [
-      352
+      350
     ]
   },
   {
     "teal": 329,
     "source": 62,
     "pc": [
-      353,
-      354,
-      355
+      351,
+      352,
+      353
     ]
   },
   {
     "teal": 334,
     "source": 63,
     "pc": [
-      356,
-      357
+      354,
+      355
     ]
   },
   {
     "teal": 335,
     "source": 63,
     "pc": [
-      358,
-      359,
-      360
+      356,
+      357,
+      358
     ]
   },
   {
     "teal": 336,
     "source": 62,
     "pc": [
-      361,
-      362,
-      363
+      359,
+      360,
+      361
     ]
   },
   {
     "teal": 341,
     "source": 65,
     "pc": [
-      364,
-      365
+      362,
+      363
     ]
   },
   {
     "teal": 342,
     "source": 65,
     "pc": [
-      366,
-      367
+      364,
+      365
     ]
   },
   {
     "teal": 343,
     "source": 65,
     "pc": [
-      368
+      366
     ]
   },
   {
     "teal": 344,
     "source": 65,
     "pc": [
-      369
+      367
     ]
   },
   {
     "teal": 345,
     "source": 65,
     "pc": [
-      370
+      368
     ]
   },
   {
     "teal": 346,
     "source": 65,
     "pc": [
-      371,
-      372
+      369,
+      370
     ]
   },
   {
     "teal": 347,
     "source": 65,
     "pc": [
-      373
+      371
     ]
   },
   {
     "teal": 348,
     "source": 65,
     "pc": [
-      374
+      372
     ]
   },
   {
     "teal": 349,
     "source": 65,
     "pc": [
-      375
+      373
     ]
   },
   {
     "teal": 350,
     "source": 65,
     "pc": [
-      376,
-      377,
-      378
+      374,
+      375,
+      376
     ]
   },
   {
     "teal": 353,
     "source": 54,
     "pc": [
-      379
+      377
     ]
   },
   {
     "teal": 357,
     "source": 76,
     "pc": [
-      380,
-      381,
-      382
+      378,
+      379,
+      380
     ]
   },
   {
     "teal": 358,
     "source": 76,
     "pc": [
-      383
+      381
     ]
   },
   {
     "teal": 359,
     "source": 76,
     "pc": [
-      384
+      382
     ]
   },
   {
     "teal": 360,
     "source": 76,
     "pc": [
-      385
+      383
     ]
   },
   {
     "teal": 361,
     "source": 76,
     "pc": [
-      386
+      384
     ]
   },
   {
     "teal": 362,
     "source": 76,
     "pc": [
-      387
+      385
     ]
   },
   {
     "teal": 363,
     "source": 76,
     "pc": [
-      388
+      386
     ]
   },
   {
     "teal": 366,
     "source": 76,
     "pc": [
-      389,
-      390,
-      391
+      387,
+      388,
+      389
     ]
   },
   {
     "teal": 367,
     "source": 76,
     "pc": [
-      392,
-      393,
-      394
+      390,
+      391,
+      392
     ]
   },
   {
     "teal": 370,
     "source": 76,
     "pc": [
-      395,
-      396,
-      397
+      393,
+      394,
+      395
     ]
   },
   {
     "teal": 371,
     "source": 76,
     "pc": [
-      398
+      396
     ]
   },
   {
     "teal": 372,
     "source": 76,
     "pc": [
-      399
+      397
     ]
   },
   {
     "teal": 381,
     "source": 76,
     "pc": [
-      400,
-      401,
-      402
+      398,
+      399,
+      400
     ]
   },
   {
     "teal": 384,
     "source": 76,
     "pc": [
-      403
+      401
     ]
   },
   {
     "teal": 385,
     "source": 76,
     "pc": [
-      404
+      402
     ]
   },
   {
     "teal": 389,
     "source": 77,
     "pc": [
-      405,
-      406
+      403,
+      404
     ]
   },
   {
     "teal": 390,
     "source": 77,
     "pc": [
-      407,
-      408
+      405,
+      406
     ]
   },
   {
     "teal": 391,
     "source": 77,
     "pc": [
-      409
+      407
     ]
   },
   {
     "teal": 392,
     "source": 77,
     "pc": [
-      410,
-      411
+      408,
+      409
     ]
   },
   {
     "teal": 396,
     "source": 78,
     "pc": [
-      412
+      410
     ]
   },
   {
     "teal": 397,
     "source": 78,
     "pc": [
-      413
+      411
     ]
   },
   {
     "teal": 398,
     "source": 78,
     "pc": [
-      414
+      412
     ]
   },
   {
     "teal": 399,
     "source": 78,
     "pc": [
-      415,
-      416
+      413,
+      414
     ]
   },
   {
     "teal": 400,
     "source": 78,
     "pc": [
-      417,
-      418,
-      419
+      415,
+      416,
+      417
     ]
   },
   {
     "teal": 401,
     "source": 78,
     "pc": [
-      420,
-      421
+      418,
+      419
     ]
   },
   {
     "teal": 402,
     "source": 78,
     "pc": [
-      422
+      420
     ]
   },
   {
     "teal": 403,
     "source": 78,
     "pc": [
-      423,
-      424,
-      425
+      421,
+      422,
+      423
     ]
   },
   {
     "teal": 404,
     "source": 78,
     "pc": [
-      426,
-      427,
-      428
+      424,
+      425,
+      426
     ]
   },
   {
     "teal": 405,
     "source": 78,
     "pc": [
-      429,
-      430
+      427,
+      428
     ]
   },
   {
     "teal": 406,
     "source": 78,
     "pc": [
-      431
+      429
     ]
   },
   {
     "teal": 407,
     "source": 78,
     "pc": [
-      432
+      430
     ]
   },
   {
     "teal": 408,
     "source": 78,
     "pc": [
-      433
+      431
     ]
   },
   {
     "teal": 409,
     "source": 78,
     "pc": [
-      434,
-      435,
-      436
+      432,
+      433,
+      434
     ]
   },
   {
     "teal": 410,
     "source": 78,
     "pc": [
-      437
+      435
     ]
   },
   {
     "teal": 411,
     "source": 78,
     "pc": [
-      438
+      436
     ]
   },
   {
     "teal": 412,
     "source": 78,
     "pc": [
-      439,
-      440,
-      441
+      437,
+      438,
+      439
     ]
   },
   {
     "teal": 413,
     "source": 78,
     "pc": [
-      442
+      440
     ]
   },
   {
     "teal": 414,
     "source": 78,
     "pc": [
-      443
+      441
     ]
   },
   {
     "teal": 415,
     "source": 78,
     "pc": [
-      444,
-      445
+      442,
+      443
     ]
   },
   {
     "teal": 419,
     "source": 80,
     "pc": [
-      446,
-      447
+      444,
+      445
     ]
   },
   {
     "teal": 420,
     "source": 80,
     "pc": [
-      448
+      446
     ]
   },
   {
     "teal": 424,
     "source": 82,
     "pc": [
-      449,
-      450
+      447,
+      448
     ]
   },
   {
     "teal": 425,
     "source": 82,
     "pc": [
-      451,
-      452,
-      453
+      449,
+      450,
+      451
     ]
   },
   {
     "teal": 426,
     "source": 76,
     "pc": [
-      454
+      452
     ]
   },
   {
     "teal": 430,
     "source": 93,
     "pc": [
-      455,
-      456,
-      457
+      453,
+      454,
+      455
     ]
   },
   {
     "teal": 431,
     "source": 93,
     "pc": [
-      458
+      456
     ]
   },
   {
     "teal": 434,
     "source": 93,
     "pc": [
-      459,
-      460,
-      461
+      457,
+      458,
+      459
     ]
   },
   {
     "teal": 435,
     "source": 93,
     "pc": [
-      462
+      460
     ]
   },
   {
     "teal": 438,
     "source": 93,
     "pc": [
-      463,
-      464,
-      465
+      461,
+      462,
+      463
     ]
   },
   {
     "teal": 439,
     "source": 93,
     "pc": [
-      466
+      464
     ]
   },
   {
     "teal": 440,
     "source": 93,
     "pc": [
-      467
+      465
     ]
   },
   {
     "teal": 441,
     "source": 93,
     "pc": [
-      468
+      466
     ]
   },
   {
     "teal": 442,
     "source": 93,
     "pc": [
-      469
+      467
     ]
   },
   {
     "teal": 443,
     "source": 93,
     "pc": [
-      470
+      468
     ]
   },
   {
     "teal": 444,
     "source": 93,
     "pc": [
-      471
+      469
     ]
   },
   {
     "teal": 447,
     "source": 93,
     "pc": [
-      472,
-      473,
-      474
+      470,
+      471,
+      472
     ]
   },
   {
     "teal": 448,
     "source": 93,
     "pc": [
-      475,
-      476,
-      477
+      473,
+      474,
+      475
     ]
   },
   {
     "teal": 451,
     "source": 93,
     "pc": [
-      478,
-      479,
-      480
+      476,
+      477,
+      478
     ]
   },
   {
     "teal": 452,
     "source": 93,
     "pc": [
-      481
+      479
     ]
   },
   {
     "teal": 453,
     "source": 93,
     "pc": [
-      482
+      480
     ]
   },
   {
     "teal": 463,
     "source": 93,
     "pc": [
-      483,
-      484,
-      485
+      481,
+      482,
+      483
     ]
   },
   {
     "teal": 466,
     "source": 93,
     "pc": [
-      486
+      484
     ]
   },
   {
     "teal": 467,
     "source": 93,
     "pc": [
-      487,
-      488
+      485,
+      486
     ]
   },
   {
     "teal": 471,
     "source": 94,
     "pc": [
-      489,
-      490
+      487,
+      488
     ]
   },
   {
     "teal": 472,
     "source": 94,
     "pc": [
-      491,
-      492
+      489,
+      490
     ]
   },
   {
     "teal": 473,
     "source": 94,
     "pc": [
-      493
+      491
     ]
   },
   {
     "teal": 474,
     "source": 94,
     "pc": [
-      494,
-      495
+      492,
+      493
     ]
   },
   {
     "teal": 478,
     "source": 95,
     "pc": [
-      496
+      494
     ]
   },
   {
     "teal": 479,
     "source": 95,
     "pc": [
-      497
+      495
     ]
   },
   {
     "teal": 480,
     "source": 95,
     "pc": [
-      498
+      496
     ]
   },
   {
     "teal": 481,
     "source": 95,
     "pc": [
-      499,
-      500
+      497,
+      498
     ]
   },
   {
     "teal": 482,
     "source": 95,
     "pc": [
-      501,
-      502,
-      503
+      499,
+      500,
+      501
     ]
   },
   {
     "teal": 483,
     "source": 95,
     "pc": [
-      504,
-      505
+      502,
+      503
     ]
   },
   {
     "teal": 484,
     "source": 95,
     "pc": [
-      506
+      504
     ]
   },
   {
     "teal": 485,
     "source": 95,
     "pc": [
-      507,
-      508,
-      509
+      505,
+      506,
+      507
     ]
   },
   {
     "teal": 486,
     "source": 95,
     "pc": [
-      510,
-      511,
-      512
+      508,
+      509,
+      510
     ]
   },
   {
     "teal": 487,
     "source": 95,
     "pc": [
-      513,
-      514
+      511,
+      512
     ]
   },
   {
     "teal": 488,
     "source": 95,
     "pc": [
-      515
+      513
     ]
   },
   {
     "teal": 489,
     "source": 95,
     "pc": [
-      516
+      514
     ]
   },
   {
     "teal": 490,
     "source": 95,
     "pc": [
-      517
+      515
     ]
   },
   {
     "teal": 491,
     "source": 95,
     "pc": [
-      518,
-      519,
-      520
+      516,
+      517,
+      518
     ]
   },
   {
     "teal": 492,
     "source": 95,
     "pc": [
-      521
+      519
     ]
   },
   {
     "teal": 493,
     "source": 95,
     "pc": [
-      522
+      520
     ]
   },
   {
     "teal": 494,
     "source": 95,
     "pc": [
-      523,
-      524,
-      525
+      521,
+      522,
+      523
     ]
   },
   {
     "teal": 495,
     "source": 95,
     "pc": [
-      526
+      524
     ]
   },
   {
     "teal": 496,
     "source": 95,
     "pc": [
-      527
+      525
     ]
   },
   {
     "teal": 497,
     "source": 95,
     "pc": [
-      528,
-      529
+      526,
+      527
     ]
   },
   {
     "teal": 501,
     "source": 97,
     "pc": [
-      530,
-      531
+      528,
+      529
     ]
   },
   {
     "teal": 502,
     "source": 97,
     "pc": [
-      532
+      530
     ]
   },
   {
     "teal": 503,
     "source": 97,
     "pc": [
-      533
+      531
     ]
   },
   {
     "teal": 504,
     "source": 97,
     "pc": [
-      534,
-      535,
-      536
+      532
     ]
   },
   {
     "teal": 505,
     "source": 97,
     "pc": [
-      537
+      533
     ]
   },
   {
     "teal": 506,
     "source": 97,
     "pc": [
-      538,
-      539
+      534,
+      535
     ]
   },
   {
     "teal": 507,
     "source": 97,
     "pc": [
-      540
+      536
     ]
   },
   {
     "teal": 508,
     "source": 97,
     "pc": [
-      541
+      537
     ]
   },
   {
     "teal": 509,
     "source": 97,
     "pc": [
-      542,
-      543
+      538,
+      539
     ]
   },
   {
     "teal": 510,
     "source": 97,
     "pc": [
-      544,
-      545
+      540,
+      541
     ]
   },
   {
     "teal": 511,
     "source": 97,
     "pc": [
-      546,
-      547
+      542,
+      543
     ]
   },
   {
     "teal": 512,
     "source": 97,
     "pc": [
-      548,
-      549
+      544,
+      545
     ]
   },
   {
     "teal": 513,
     "source": 97,
     "pc": [
-      550
+      546
     ]
   },
   {
     "teal": 514,
     "source": 97,
     "pc": [
-      551
+      547
     ]
   },
   {
     "teal": 515,
     "source": 97,
     "pc": [
-      552,
-      553,
-      554
+      548
     ]
   },
   {
     "teal": 516,
     "source": 97,
     "pc": [
-      555
+      549
     ]
   },
   {
     "teal": 517,
     "source": 97,
     "pc": [
-      556,
-      557
+      550,
+      551
     ]
   },
   {
     "teal": 518,
     "source": 97,
     "pc": [
-      558
+      552
     ]
   },
   {
     "teal": 519,
     "source": 97,
     "pc": [
-      559,
-      560
+      553,
+      554
     ]
   },
   {
     "teal": 520,
     "source": 97,
     "pc": [
-      561
+      555
     ]
   },
   {
     "teal": 521,
     "source": 97,
     "pc": [
-      562
+      556
     ]
   },
   {
     "teal": 522,
     "source": 97,
     "pc": [
-      563,
-      564,
-      565
+      557
     ]
   },
   {
     "teal": 523,
     "source": 97,
     "pc": [
-      566
+      558
     ]
   },
   {
     "teal": 524,
     "source": 97,
     "pc": [
-      567
+      559
     ]
   },
   {
     "teal": 525,
     "source": 97,
     "pc": [
-      568,
-      569
+      560,
+      561
     ]
   },
   {
     "teal": 526,
     "source": 97,
     "pc": [
-      570,
-      571
+      562,
+      563
     ]
   },
   {
     "teal": 527,
     "source": 97,
     "pc": [
-      572
+      564
     ]
   },
   {
     "teal": 528,
     "source": 97,
     "pc": [
-      573
+      565
     ]
   },
   {
     "teal": 529,
     "source": 97,
     "pc": [
-      574
+      566
     ]
   },
   {
     "teal": 530,
     "source": 97,
     "pc": [
-      575
+      567
     ]
   },
   {
     "teal": 531,
     "source": 97,
     "pc": [
-      576
+      568
     ]
   },
   {
     "teal": 532,
     "source": 97,
     "pc": [
-      577
+      569
     ]
   },
   {
     "teal": 533,
     "source": 97,
     "pc": [
-      578,
-      579
+      570,
+      571
     ]
   },
   {
     "teal": 534,
     "source": 97,
     "pc": [
-      580
+      572
     ]
   },
   {
     "teal": 535,
     "source": 97,
     "pc": [
-      581
+      573
     ]
   },
   {
     "teal": 536,
     "source": 97,
     "pc": [
-      582,
-      583,
-      584
+      574
     ]
   },
   {
     "teal": 537,
     "source": 97,
     "pc": [
-      585,
-      586
+      575,
+      576
     ]
   },
   {
     "teal": 538,
     "source": 97,
     "pc": [
-      587,
-      588
+      577,
+      578
     ]
   },
   {
     "teal": 539,
     "source": 97,
     "pc": [
-      589
+      579
     ]
   },
   {
     "teal": 540,
     "source": 97,
     "pc": [
-      590
+      580
     ]
   },
   {
     "teal": 541,
     "source": 97,
     "pc": [
-      591
+      581
     ]
   },
   {
     "teal": 542,
     "source": 97,
     "pc": [
-      592
+      582
     ]
   },
   {
     "teal": 543,
     "source": 97,
     "pc": [
-      593,
-      594
+      583,
+      584
     ]
   },
   {
     "teal": 544,
     "source": 97,
     "pc": [
-      595
+      585
     ]
   },
   {
     "teal": 545,
     "source": 97,
     "pc": [
-      596
+      586
     ]
   },
   {
     "teal": 546,
     "source": 97,
     "pc": [
-      597
+      587
     ]
   },
   {
     "teal": 547,
     "source": 97,
     "pc": [
-      598
+      588
     ]
   },
   {
     "teal": 548,
     "source": 97,
     "pc": [
-      599
+      589
     ]
   },
   {
     "teal": 549,
     "source": 97,
     "pc": [
-      600
+      590
     ]
   },
   {
     "teal": 550,
     "source": 97,
     "pc": [
-      601
+      591
     ]
   },
   {
     "teal": 551,
     "source": 97,
     "pc": [
-      602
+      592
     ]
   },
   {
     "teal": 552,
     "source": 97,
     "pc": [
-      603
+      593
     ]
   },
   {
     "teal": 553,
     "source": 97,
     "pc": [
-      604,
-      605,
-      606
+      594,
+      595,
+      596
     ]
   },
   {
     "teal": 554,
     "source": 97,
     "pc": [
-      607
+      597
     ]
   },
   {
     "teal": 555,
     "source": 97,
     "pc": [
-      608
+      598
     ]
   },
   {
     "teal": 556,
     "source": 97,
     "pc": [
-      609
+      599
     ]
   },
   {
     "teal": 557,
     "source": 97,
     "pc": [
-      610,
-      611
+      600,
+      601
     ]
   },
   {
     "teal": 561,
     "source": 99,
     "pc": [
-      612,
-      613
+      602,
+      603
     ]
   },
   {
     "teal": 562,
     "source": 99,
     "pc": [
-      614,
-      615
+      604,
+      605
     ]
   },
   {
     "teal": 563,
     "source": 99,
     "pc": [
-      616,
-      617
+      606,
+      607
     ]
   },
   {
     "teal": 564,
     "source": 99,
     "pc": [
-      618,
-      619,
-      620
+      608,
+      609,
+      610
     ]
   },
   {
     "teal": 565,
     "source": 99,
     "pc": [
-      621
+      611
     ]
   },
   {
     "teal": 566,
     "source": 99,
     "pc": [
-      622,
-      623
+      612,
+      613
     ]
   },
   {
     "teal": 567,
     "source": 99,
     "pc": [
-      624
+      614
     ]
   },
   {
     "teal": 568,
     "source": 99,
     "pc": [
-      625
+      615
     ]
   },
   {
     "teal": 572,
     "source": 101,
     "pc": [
-      626,
-      627
+      616,
+      617
     ]
   },
   {
     "teal": 573,
     "source": 101,
     "pc": [
-      628,
-      629,
-      630
+      618,
+      619,
+      620
     ]
   },
   {
     "teal": 574,
     "source": 93,
     "pc": [
-      631
+      621
     ]
   },
   {
     "teal": 577,
     "source": 6,
     "pc": [
-      632
+      622
     ]
   },
   {
     "teal": 578,
     "source": 6,
     "pc": [
-      633
+      623
     ]
   },
   {
     "teal": 581,
     "source": 6,
     "pc": [
-      634,
-      635,
-      636,
-      637,
-      638,
-      639
+      624,
+      625,
+      626,
+      627,
+      628,
+      629
     ]
   },
   {
     "teal": 582,
     "source": 6,
     "pc": [
-      640,
-      641,
-      642
+      630,
+      631,
+      632
     ]
   },
   {
     "teal": 583,
     "source": 6,
     "pc": [
-      643,
-      644,
-      645,
-      646
+      633,
+      634,
+      635,
+      636
     ]
   },
   {
     "teal": 584,
     "source": 6,
     "pc": [
-      647
+      637
     ]
   },
   {
     "teal": 587,
     "source": 6,
     "pc": [
+      638,
+      639,
+      640,
+      641,
+      642,
+      643
+    ]
+  },
+  {
+    "teal": 588,
+    "source": 6,
+    "pc": [
+      644,
+      645,
+      646,
+      647,
       648,
-      649,
+      649
+    ]
+  },
+  {
+    "teal": 589,
+    "source": 6,
+    "pc": [
       650,
       651,
       652,
-      653
+      653,
+      654,
+      655
     ]
   },
   {
-    "teal": 588,
+    "teal": 590,
     "source": 6,
     "pc": [
-      654,
-      655,
       656,
       657,
       658,
-      659
+      659,
+      660,
+      661
     ]
   },
   {
-    "teal": 589,
+    "teal": 591,
     "source": 6,
     "pc": [
-      660,
-      661,
       662,
       663,
-      664,
-      665
+      664
     ]
   },
   {
-    "teal": 590,
+    "teal": 592,
     "source": 6,
     "pc": [
+      665,
       666,
       667,
       668,
       669,
       670,
-      671
-    ]
-  },
-  {
-    "teal": 591,
-    "source": 6,
-    "pc": [
+      671,
       672,
       673,
       674
     ]
   },
-  {
-    "teal": 592,
-    "source": 6,
-    "pc": [
-      675,
-      676,
-      677,
-      678,
-      679,
-      680,
-      681,
-      682,
-      683,
-      684
-    ]
-  },
   {
     "teal": 593,
     "source": 6,
     "pc": [
-      685
+      675
     ]
   },
   {
     "teal": 596,
     "source": 6,
     "pc": [
-      686,
-      687,
-      688
+      676,
+      677,
+      678
     ]
   },
   {
     "teal": 597,
     "source": 6,
     "pc": [
-      689,
-      690
+      679,
+      680
     ]
   },
   {
     "teal": 598,
     "source": 6,
     "pc": [
-      691,
-      692
+      681,
+      682
     ]
   },
   {
     "teal": 599,
     "source": 6,
     "pc": [
-      693
+      683
     ]
   },
   {
     "teal": 600,
     "source": 6,
     "pc": [
-      694,
-      695
+      684,
+      685
     ]
   },
   {
     "teal": 601,
     "source": 6,
     "pc": [
-      696,
-      697
+      686,
+      687
     ]
   },
   {
     "teal": 602,
     "source": 6,
     "pc": [
-      698
+      688
     ]
   },
   {
     "teal": 605,
     "source": 6,
     "pc": [
-      699,
-      700,
-      701
+      689,
+      690,
+      691
     ]
   },
   {
     "teal": 606,
     "source": 6,
     "pc": [
-      702,
-      703
+      692,
+      693
     ]
   },
   {
     "teal": 607,
     "source": 6,
     "pc": [
-      704,
-      705
+      694,
+      695
     ]
   },
   {
     "teal": 608,
     "source": 6,
     "pc": [
-      706
+      696
     ]
   },
   {
     "teal": 609,
     "source": 6,
     "pc": [
-      707,
-      708
+      697,
+      698
     ]
   },
   {
     "teal": 610,
     "source": 6,
     "pc": [
-      709,
-      710
+      699,
+      700
     ]
   },
   {
     "teal": 611,
     "source": 6,
     "pc": [
-      711
+      701
     ]
   },
   {
     "teal": 612,
     "source": 6,
     "pc": [
-      712
+      702
     ]
   },
   {
     "teal": 613,
     "source": 6,
     "pc": [
-      713,
-      714
+      703,
+      704
     ]
   },
   {
     "teal": 614,
     "source": 6,
     "pc": [
-      715
+      705
     ]
   },
   {
     "teal": 615,
     "source": 6,
     "pc": [
-      716
+      706
     ]
   },
   {
     "teal": 616,
     "source": 6,
     "pc": [
-      717
+      707
     ]
   },
   {
     "teal": 617,
     "source": 6,
     "pc": [
-      718,
-      719,
-      720
+      708,
+      709,
+      710
     ]
   },
   {
     "teal": 618,
     "source": 6,
     "pc": [
-      721,
-      722
+      711,
+      712
     ]
   },
   {
     "teal": 619,
     "source": 6,
     "pc": [
-      723,
-      724
+      713,
+      714
     ]
   },
   {
     "teal": 620,
     "source": 6,
     "pc": [
-      725
+      715
     ]
   },
   {
     "teal": 621,
     "source": 6,
     "pc": [
-      726
+      716
     ]
   },
   {
     "teal": 622,
     "source": 6,
     "pc": [
-      727,
-      728
+      717,
+      718
     ]
   },
   {
     "teal": 623,
     "source": 6,
     "pc": [
-      729,
-      730
+      719,
+      720
     ]
   },
   {
     "teal": 624,
     "source": 6,
     "pc": [
-      731,
-      732
+      721,
+      722
     ]
   },
   {
     "teal": 625,
     "source": 6,
     "pc": [
-      733,
-      734
+      723,
+      724
     ]
   },
   {
     "teal": 626,
     "source": 6,
     "pc": [
-      735
+      725
     ]
   }
 ]
\ No newline at end of file
diff --git a/examples/big_box/artifacts/BigBox.approval.teal b/examples/big_box/artifacts/BigBox.approval.teal
index 3388bdb65..55eeb278f 100644
--- a/examples/big_box/artifacts/BigBox.approval.teal
+++ b/examples/big_box/artifacts/BigBox.approval.teal
@@ -212,10 +212,10 @@ upload:
 
 	// examples/big_box/big_box.algo.ts:77
 	// assert(metadata.status === IN_PROGRESS)
-	frame_dig 0 // storage key//metadata
-	box_get
-	assert
-	extract 16 1
+	frame_dig -1 // dataIdentifier: string
+	int 16 // headOffset
+	int 1
+	box_extract
 	btoi
 	int 0
 	==
@@ -223,20 +223,20 @@ upload:
 
 	// examples/big_box/big_box.algo.ts:78
 	// assert(metadata.start <= boxIndex && boxIndex <= metadata.end)
-	frame_dig 0 // storage key//metadata
-	box_get
-	assert
-	extract 0 8
+	frame_dig -1 // dataIdentifier: string
+	int 0
+	int 8
+	box_extract
 	btoi
 	frame_dig -2 // boxIndex: uint64
 	<=
 	dup
 	bz skip_and0
 	frame_dig -2 // boxIndex: uint64
-	frame_dig 0 // storage key//metadata
-	box_get
-	assert
-	extract 8 8
+	frame_dig -1 // dataIdentifier: string
+	int 8 // headOffset
+	int 8
+	box_extract
 	btoi
 	<=
 	&&
@@ -258,17 +258,17 @@ skip_and0:
 	frame_dig -2 // boxIndex: uint64
 	itob
 	frame_dig -2 // boxIndex: uint64
-	frame_dig 0 // storage key//metadata
-	box_get
-	assert
-	extract 8 8
+	frame_dig -1 // dataIdentifier: string
+	int 8 // headOffset
+	int 8
+	box_extract
 	btoi
 	==
 	bz ternary0_false
-	frame_dig 0 // storage key//metadata
-	box_get
-	assert
-	extract 17 8
+	frame_dig -1 // dataIdentifier: string
+	int 17 // headOffset
+	int 8
+	box_extract
 	btoi
 	b ternary0_end
 
@@ -277,6 +277,7 @@ ternary0_false:
 
 ternary0_end:
 	box_create
+	pop
 
 if0_end:
 	// examples/big_box/big_box.algo.ts:84
@@ -323,9 +324,9 @@ setStatus:
 	// examples/big_box/big_box.algo.ts:95
 	// currentStatus = this.metadata(dataIdentifier).value.status
 	frame_dig -1 // dataIdentifier: string
-	box_get
-	assert
-	extract 16 1
+	int 16 // headOffset
+	int 1
+	box_extract
 	btoi
 	frame_bury 0 // currentStatus: uint8
 
@@ -361,7 +362,7 @@ skip_or1:
 
 	// examples/big_box/big_box.algo.ts:100
 	// this.metadata(dataIdentifier).value.status = status
-	int 16
+	int 16 // headOffset
 	frame_dig -2 // status: uint<8>
 	itob
 	extract 7 1
diff --git a/examples/big_box/artifacts/BigBox.arc32.json b/examples/big_box/artifacts/BigBox.arc32.json
index aed63c24a..7f9deed44 100644
--- a/examples/big_box/artifacts/BigBox.arc32.json
+++ b/examples/big_box/artifacts/BigBox.arc32.json
@@ -54,7 +54,7 @@
     }
   },
   "source": {
-    "approval": "#pragma version 9

// This TEAL was generated by TEALScript v0.74.0
// https://github.com/algorandfoundation/TEALScript

// This contract is compliant with and/or implements the following ARCs: [ ARC4 ]

// The following ten lines of TEAL handle initial program flow
// This pattern is used to make it easy for anyone to parse the start of the program and determine if a specific action is allowed
// Here, action refers to the OnComplete in combination with whether the app is being created or called
// Every possible action for this contract is represented in the switch statement
// If the action is not implmented in the contract, its respective branch will be "NOT_IMPLEMENTED" which just contains "err"
txn ApplicationID
!
int 6
*
txn OnCompletion
+
switch call_NoOp NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED create_NoOp NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED

NOT_IMPLEMENTED:
	err

abi_route_startUpload:
	// mbrPayment: pay
	txn GroupIndex
	int 1
	-
	dup
	gtxns TypeEnum
	int pay
	==
	assert

	// endBoxSize: uint64
	txna ApplicationArgs 3
	btoi

	// numBoxes: uint64
	txna ApplicationArgs 2
	btoi

	// dataIdentifier: string
	txna ApplicationArgs 1
	extract 2 0

	// execute startUpload(pay,uint64,uint64,string)void
	callsub startUpload
	int 1
	return

// startUpload(pay,uint64,uint64,string)void
//
//
// Allocate boxes to begin data upload process
//
// @param dataIdentifier The unique identifier for the data
// @param numBoxes The number of boxes that the data will take up
// @param endBoxSize The size of the last box
// @param mbrPayment Payment from the uploader to cover the box MBR
startUpload:
	proto 4 0

	// Push empty bytes after the frame pointer to reserve space for local variables
	byte 0x
	dupn 4

	// examples/big_box/big_box.algo.ts:41
	// startBox = this.currentIndex.value
	byte 0x63757272656e74496e646578 // "currentIndex"
	app_global_get
	frame_bury 0 // startBox: uint64

	// examples/big_box/big_box.algo.ts:42
	// endBox = startBox + numBoxes - 1
	frame_dig 0 // startBox: uint64
	frame_dig -2 // numBoxes: uint64
	+
	int 1
	-
	frame_bury 1 // endBox: uint64

	// examples/big_box/big_box.algo.ts:44
	// metadata: Metadata = {
	//       start: startBox,
	//       end: endBox,
	//       status: IN_PROGRESS,
	//       endSize: endBoxSize,
	//     }
	frame_dig 0 // startBox: uint64
	itob
	frame_dig 1 // endBox: uint64
	itob
	concat
	byte 0x00
	concat
	frame_dig -3 // endBoxSize: uint64
	itob
	concat
	frame_bury 2 // metadata: Metadata

	// examples/big_box/big_box.algo.ts:51
	// assert(!this.metadata(dataIdentifier).exists)
	frame_dig -1 // dataIdentifier: string
	box_len
	swap
	pop
	!
	assert

	// examples/big_box/big_box.algo.ts:53
	// this.metadata(dataIdentifier).value = metadata
	frame_dig -1 // dataIdentifier: string
	frame_dig 2 // metadata: Metadata
	box_put

	// examples/big_box/big_box.algo.ts:55
	// this.currentIndex.value = endBox + 1
	byte 0x63757272656e74496e646578 // "currentIndex"
	frame_dig 1 // endBox: uint64
	int 1
	+
	app_global_put

	// examples/big_box/big_box.algo.ts:57
	// totalCost =
	//       numBoxes * COST_PER_BOX + // cost of boxes
	//       (numBoxes - 1) * MAX_BOX_SIZE * COST_PER_BYTE + // cost of data
	//       numBoxes * 64 * COST_PER_BYTE + // cost of keys
	//       endBoxSize * COST_PER_BYTE
	frame_dig -2 // numBoxes: uint64
	int 2500
	*
	frame_dig -2 // numBoxes: uint64
	int 1
	-
	int 32768
	*
	int 400
	*
	+
	frame_dig -2 // numBoxes: uint64
	int 64
	*
	int 400
	*
	+
	frame_dig -3 // endBoxSize: uint64
	int 400
	*
	+
	frame_bury 3 // totalCost: uint64

	// examples/big_box/big_box.algo.ts:63
	// verifyPayTxn(mbrPayment, { receiver: this.app.address, amount: totalCost })
	// verify receiver
	frame_dig -4 // mbrPayment: PayTxn
	gtxns Receiver
	global CurrentApplicationAddress
	==
	assert

	// verify amount
	frame_dig -4 // mbrPayment: PayTxn
	gtxns Amount
	frame_dig 3 // totalCost: uint64
	==
	assert
	retsub

abi_route_upload:
	// data: byte[]
	txna ApplicationArgs 4
	extract 2 0

	// offset: uint64
	txna ApplicationArgs 3
	btoi

	// boxIndex: uint64
	txna ApplicationArgs 2
	btoi

	// dataIdentifier: string
	txna ApplicationArgs 1
	extract 2 0

	// execute upload(byte[],uint64,uint64,string)void
	callsub upload
	int 1
	return

// upload(byte[],uint64,uint64,string)void
//
//
// Upload data to a specific offset in a box
//
// @param dataIdentifier The unique identifier for the data
// @param boxIndex The index of the box to upload the given chunk of data to
// @param offset The offset within the box to start writing the data
// @param data The data to write
upload:
	proto 4 0

	// Push empty bytes after the frame pointer to reserve space for local variables
	byte 0x

	// examples/big_box/big_box.algo.ts:76
	// metadata = this.metadata(dataIdentifier).value
	frame_dig -1 // dataIdentifier: string
	frame_bury 0 // storage key//metadata

	// examples/big_box/big_box.algo.ts:77
	// assert(metadata.status === IN_PROGRESS)
	frame_dig 0 // storage key//metadata
	box_get
	assert
	extract 16 1
	btoi
	int 0
	==
	assert

	// examples/big_box/big_box.algo.ts:78
	// assert(metadata.start <= boxIndex && boxIndex <= metadata.end)
	frame_dig 0 // storage key//metadata
	box_get
	assert
	extract 0 8
	btoi
	frame_dig -2 // boxIndex: uint64
	<=
	dup
	bz skip_and0
	frame_dig -2 // boxIndex: uint64
	frame_dig 0 // storage key//metadata
	box_get
	assert
	extract 8 8
	btoi
	<=
	&&

skip_and0:
	assert

	// if0_condition
	// examples/big_box/big_box.algo.ts:80
	// offset === 0
	frame_dig -3 // offset: uint64
	int 0
	==
	bz if0_end

	// if0_consequent
	// examples/big_box/big_box.algo.ts:81
	// this.dataBoxes(boxIndex).create(boxIndex === metadata.end ? metadata.endSize : MAX_BOX_SIZE)
	frame_dig -2 // boxIndex: uint64
	itob
	frame_dig -2 // boxIndex: uint64
	frame_dig 0 // storage key//metadata
	box_get
	assert
	extract 8 8
	btoi
	==
	bz ternary0_false
	frame_dig 0 // storage key//metadata
	box_get
	assert
	extract 17 8
	btoi
	b ternary0_end

ternary0_false:
	int 32768

ternary0_end:
	box_create

if0_end:
	// examples/big_box/big_box.algo.ts:84
	// this.dataBoxes(boxIndex).replace(offset, data)
	frame_dig -2 // boxIndex: uint64
	itob
	frame_dig -3 // offset: uint64
	frame_dig -4 // data: bytes
	box_replace
	retsub

abi_route_setStatus:
	// status: uint8
	txna ApplicationArgs 2
	dup
	len
	int 1
	==
	assert
	btoi

	// dataIdentifier: string
	txna ApplicationArgs 1
	extract 2 0

	// execute setStatus(uint8,string)void
	callsub setStatus
	int 1
	return

// setStatus(uint8,string)void
//
//
// Set the status of the data
//
// @param dataIdentifier The unique identifier for the data
// @param status The new status for the data
setStatus:
	proto 2 0

	// Push empty bytes after the frame pointer to reserve space for local variables
	byte 0x

	// examples/big_box/big_box.algo.ts:95
	// currentStatus = this.metadata(dataIdentifier).value.status
	frame_dig -1 // dataIdentifier: string
	box_get
	assert
	extract 16 1
	btoi
	frame_bury 0 // currentStatus: uint8

	// examples/big_box/big_box.algo.ts:97
	// assert(status === READY || status === IMMUTABLE || status === IN_PROGRESS)
	frame_dig -2 // status: uint<8>
	int 1
	==
	dup
	bnz skip_or0
	frame_dig -2 // status: uint<8>
	int 2
	==
	||

skip_or0:
	dup
	bnz skip_or1
	frame_dig -2 // status: uint<8>
	int 0
	==
	||

skip_or1:
	assert

	// examples/big_box/big_box.algo.ts:98
	// assert(currentStatus !== IMMUTABLE)
	frame_dig 0 // currentStatus: uint8
	int 2
	!=
	assert

	// examples/big_box/big_box.algo.ts:100
	// this.metadata(dataIdentifier).value.status = status
	int 16
	frame_dig -2 // status: uint<8>
	itob
	extract 7 1
	frame_dig -1 // dataIdentifier: string
	cover 2
	box_replace
	retsub

abi_route_createApplication:
	int 1
	return

create_NoOp:
	method "createApplication()void"
	txna ApplicationArgs 0
	match abi_route_createApplication
	err

call_NoOp:
	method "startUpload(string,uint64,uint64,pay)void"
	method "upload(string,uint64,uint64,byte[])void"
	method "setStatus(string,uint8)void"
	txna ApplicationArgs 0
	match abi_route_startUpload abi_route_upload abi_route_setStatus
	err",
+    "approval": "#pragma version 9

// This TEAL was generated by TEALScript v0.74.0
// https://github.com/algorandfoundation/TEALScript

// This contract is compliant with and/or implements the following ARCs: [ ARC4 ]

// The following ten lines of TEAL handle initial program flow
// This pattern is used to make it easy for anyone to parse the start of the program and determine if a specific action is allowed
// Here, action refers to the OnComplete in combination with whether the app is being created or called
// Every possible action for this contract is represented in the switch statement
// If the action is not implmented in the contract, its respective branch will be "NOT_IMPLEMENTED" which just contains "err"
txn ApplicationID
!
int 6
*
txn OnCompletion
+
switch call_NoOp NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED create_NoOp NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED

NOT_IMPLEMENTED:
	err

abi_route_startUpload:
	// mbrPayment: pay
	txn GroupIndex
	int 1
	-
	dup
	gtxns TypeEnum
	int pay
	==
	assert

	// endBoxSize: uint64
	txna ApplicationArgs 3
	btoi

	// numBoxes: uint64
	txna ApplicationArgs 2
	btoi

	// dataIdentifier: string
	txna ApplicationArgs 1
	extract 2 0

	// execute startUpload(pay,uint64,uint64,string)void
	callsub startUpload
	int 1
	return

// startUpload(pay,uint64,uint64,string)void
//
//
// Allocate boxes to begin data upload process
//
// @param dataIdentifier The unique identifier for the data
// @param numBoxes The number of boxes that the data will take up
// @param endBoxSize The size of the last box
// @param mbrPayment Payment from the uploader to cover the box MBR
startUpload:
	proto 4 0

	// Push empty bytes after the frame pointer to reserve space for local variables
	byte 0x
	dupn 4

	// examples/big_box/big_box.algo.ts:41
	// startBox = this.currentIndex.value
	byte 0x63757272656e74496e646578 // "currentIndex"
	app_global_get
	frame_bury 0 // startBox: uint64

	// examples/big_box/big_box.algo.ts:42
	// endBox = startBox + numBoxes - 1
	frame_dig 0 // startBox: uint64
	frame_dig -2 // numBoxes: uint64
	+
	int 1
	-
	frame_bury 1 // endBox: uint64

	// examples/big_box/big_box.algo.ts:44
	// metadata: Metadata = {
	//       start: startBox,
	//       end: endBox,
	//       status: IN_PROGRESS,
	//       endSize: endBoxSize,
	//     }
	frame_dig 0 // startBox: uint64
	itob
	frame_dig 1 // endBox: uint64
	itob
	concat
	byte 0x00
	concat
	frame_dig -3 // endBoxSize: uint64
	itob
	concat
	frame_bury 2 // metadata: Metadata

	// examples/big_box/big_box.algo.ts:51
	// assert(!this.metadata(dataIdentifier).exists)
	frame_dig -1 // dataIdentifier: string
	box_len
	swap
	pop
	!
	assert

	// examples/big_box/big_box.algo.ts:53
	// this.metadata(dataIdentifier).value = metadata
	frame_dig -1 // dataIdentifier: string
	frame_dig 2 // metadata: Metadata
	box_put

	// examples/big_box/big_box.algo.ts:55
	// this.currentIndex.value = endBox + 1
	byte 0x63757272656e74496e646578 // "currentIndex"
	frame_dig 1 // endBox: uint64
	int 1
	+
	app_global_put

	// examples/big_box/big_box.algo.ts:57
	// totalCost =
	//       numBoxes * COST_PER_BOX + // cost of boxes
	//       (numBoxes - 1) * MAX_BOX_SIZE * COST_PER_BYTE + // cost of data
	//       numBoxes * 64 * COST_PER_BYTE + // cost of keys
	//       endBoxSize * COST_PER_BYTE
	frame_dig -2 // numBoxes: uint64
	int 2500
	*
	frame_dig -2 // numBoxes: uint64
	int 1
	-
	int 32768
	*
	int 400
	*
	+
	frame_dig -2 // numBoxes: uint64
	int 64
	*
	int 400
	*
	+
	frame_dig -3 // endBoxSize: uint64
	int 400
	*
	+
	frame_bury 3 // totalCost: uint64

	// examples/big_box/big_box.algo.ts:63
	// verifyPayTxn(mbrPayment, { receiver: this.app.address, amount: totalCost })
	// verify receiver
	frame_dig -4 // mbrPayment: PayTxn
	gtxns Receiver
	global CurrentApplicationAddress
	==
	assert

	// verify amount
	frame_dig -4 // mbrPayment: PayTxn
	gtxns Amount
	frame_dig 3 // totalCost: uint64
	==
	assert
	retsub

abi_route_upload:
	// data: byte[]
	txna ApplicationArgs 4
	extract 2 0

	// offset: uint64
	txna ApplicationArgs 3
	btoi

	// boxIndex: uint64
	txna ApplicationArgs 2
	btoi

	// dataIdentifier: string
	txna ApplicationArgs 1
	extract 2 0

	// execute upload(byte[],uint64,uint64,string)void
	callsub upload
	int 1
	return

// upload(byte[],uint64,uint64,string)void
//
//
// Upload data to a specific offset in a box
//
// @param dataIdentifier The unique identifier for the data
// @param boxIndex The index of the box to upload the given chunk of data to
// @param offset The offset within the box to start writing the data
// @param data The data to write
upload:
	proto 4 0

	// Push empty bytes after the frame pointer to reserve space for local variables
	byte 0x

	// examples/big_box/big_box.algo.ts:76
	// metadata = this.metadata(dataIdentifier).value
	frame_dig -1 // dataIdentifier: string
	frame_bury 0 // storage key//metadata

	// examples/big_box/big_box.algo.ts:77
	// assert(metadata.status === IN_PROGRESS)
	frame_dig -1 // dataIdentifier: string
	int 16 // headOffset
	int 1
	box_extract
	btoi
	int 0
	==
	assert

	// examples/big_box/big_box.algo.ts:78
	// assert(metadata.start <= boxIndex && boxIndex <= metadata.end)
	frame_dig -1 // dataIdentifier: string
	int 0
	int 8
	box_extract
	btoi
	frame_dig -2 // boxIndex: uint64
	<=
	dup
	bz skip_and0
	frame_dig -2 // boxIndex: uint64
	frame_dig -1 // dataIdentifier: string
	int 8 // headOffset
	int 8
	box_extract
	btoi
	<=
	&&

skip_and0:
	assert

	// if0_condition
	// examples/big_box/big_box.algo.ts:80
	// offset === 0
	frame_dig -3 // offset: uint64
	int 0
	==
	bz if0_end

	// if0_consequent
	// examples/big_box/big_box.algo.ts:81
	// this.dataBoxes(boxIndex).create(boxIndex === metadata.end ? metadata.endSize : MAX_BOX_SIZE)
	frame_dig -2 // boxIndex: uint64
	itob
	frame_dig -2 // boxIndex: uint64
	frame_dig -1 // dataIdentifier: string
	int 8 // headOffset
	int 8
	box_extract
	btoi
	==
	bz ternary0_false
	frame_dig -1 // dataIdentifier: string
	int 17 // headOffset
	int 8
	box_extract
	btoi
	b ternary0_end

ternary0_false:
	int 32768

ternary0_end:
	box_create
	pop

if0_end:
	// examples/big_box/big_box.algo.ts:84
	// this.dataBoxes(boxIndex).replace(offset, data)
	frame_dig -2 // boxIndex: uint64
	itob
	frame_dig -3 // offset: uint64
	frame_dig -4 // data: bytes
	box_replace
	retsub

abi_route_setStatus:
	// status: uint8
	txna ApplicationArgs 2
	dup
	len
	int 1
	==
	assert
	btoi

	// dataIdentifier: string
	txna ApplicationArgs 1
	extract 2 0

	// execute setStatus(uint8,string)void
	callsub setStatus
	int 1
	return

// setStatus(uint8,string)void
//
//
// Set the status of the data
//
// @param dataIdentifier The unique identifier for the data
// @param status The new status for the data
setStatus:
	proto 2 0

	// Push empty bytes after the frame pointer to reserve space for local variables
	byte 0x

	// examples/big_box/big_box.algo.ts:95
	// currentStatus = this.metadata(dataIdentifier).value.status
	frame_dig -1 // dataIdentifier: string
	int 16 // headOffset
	int 1
	box_extract
	btoi
	frame_bury 0 // currentStatus: uint8

	// examples/big_box/big_box.algo.ts:97
	// assert(status === READY || status === IMMUTABLE || status === IN_PROGRESS)
	frame_dig -2 // status: uint<8>
	int 1
	==
	dup
	bnz skip_or0
	frame_dig -2 // status: uint<8>
	int 2
	==
	||

skip_or0:
	dup
	bnz skip_or1
	frame_dig -2 // status: uint<8>
	int 0
	==
	||

skip_or1:
	assert

	// examples/big_box/big_box.algo.ts:98
	// assert(currentStatus !== IMMUTABLE)
	frame_dig 0 // currentStatus: uint8
	int 2
	!=
	assert

	// examples/big_box/big_box.algo.ts:100
	// this.metadata(dataIdentifier).value.status = status
	int 16 // headOffset
	frame_dig -2 // status: uint<8>
	itob
	extract 7 1
	frame_dig -1 // dataIdentifier: string
	cover 2
	box_replace
	retsub

abi_route_createApplication:
	int 1
	return

create_NoOp:
	method "createApplication()void"
	txna ApplicationArgs 0
	match abi_route_createApplication
	err

call_NoOp:
	method "startUpload(string,uint64,uint64,pay)void"
	method "upload(string,uint64,uint64,byte[])void"
	method "setStatus(string,uint8)void"
	txna ApplicationArgs 0
	match abi_route_startUpload abi_route_upload abi_route_setStatus
	err",
     "clear": "I3ByYWdtYSB2ZXJzaW9uIDk="
   },
   "contract": {
diff --git a/examples/big_box/artifacts/BigBox.src_map.json b/examples/big_box/artifacts/BigBox.src_map.json
index bf724f4d9..f916f4876 100644
--- a/examples/big_box/artifacts/BigBox.src_map.json
+++ b/examples/big_box/artifacts/BigBox.src_map.json
@@ -29,60 +29,60 @@
       23,
       24,
       25,
-      26
+      26,
+      27,
+      28
     ]
   },
   {
     "teal": 13,
     "source": 20,
     "pc": [
-      27,
-      28
+      29,
+      30
     ]
   },
   {
     "teal": 14,
     "source": 20,
     "pc": [
-      29
+      31
     ]
   },
   {
     "teal": 15,
     "source": 20,
     "pc": [
-      30,
-      31
+      32,
+      33
     ]
   },
   {
     "teal": 16,
     "source": 20,
     "pc": [
-      32
+      34
     ]
   },
   {
     "teal": 17,
     "source": 20,
     "pc": [
-      33,
-      34
+      35,
+      36
     ]
   },
   {
     "teal": 18,
     "source": 20,
     "pc": [
-      35
+      37
     ]
   },
   {
     "teal": 19,
     "source": 20,
     "pc": [
-      36,
-      37,
       38,
       39,
       40,
@@ -106,679 +106,673 @@
       58,
       59,
       60,
-      61
+      61,
+      62,
+      63
     ]
   },
   {
     "teal": 22,
     "source": 20,
     "pc": [
-      62
+      64
     ]
   },
   {
     "teal": 26,
     "source": 40,
     "pc": [
-      63,
-      64
+      65,
+      66
     ]
   },
   {
     "teal": 27,
     "source": 40,
     "pc": [
-      65
+      67
     ]
   },
   {
     "teal": 28,
     "source": 40,
     "pc": [
-      66
+      68
     ]
   },
   {
     "teal": 29,
     "source": 40,
     "pc": [
-      67
+      69
     ]
   },
   {
     "teal": 30,
     "source": 40,
     "pc": [
-      68,
-      69
+      70,
+      71
     ]
   },
   {
     "teal": 31,
     "source": 40,
     "pc": [
-      70
+      72
     ]
   },
   {
     "teal": 32,
     "source": 40,
     "pc": [
-      71
+      73
     ]
   },
   {
     "teal": 33,
     "source": 40,
     "pc": [
-      72
+      74
     ]
   },
   {
     "teal": 36,
     "source": 40,
     "pc": [
-      73,
-      74,
-      75
+      75,
+      76,
+      77
     ]
   },
   {
     "teal": 37,
     "source": 40,
     "pc": [
-      76
+      78
     ]
   },
   {
     "teal": 40,
     "source": 40,
     "pc": [
-      77,
-      78,
-      79
+      79,
+      80,
+      81
     ]
   },
   {
     "teal": 41,
     "source": 40,
     "pc": [
-      80
+      82
     ]
   },
   {
     "teal": 44,
     "source": 40,
     "pc": [
-      81,
-      82,
-      83
+      83,
+      84,
+      85
     ]
   },
   {
     "teal": 45,
     "source": 40,
     "pc": [
-      84,
-      85,
-      86
+      86,
+      87,
+      88
     ]
   },
   {
     "teal": 48,
     "source": 40,
     "pc": [
-      87,
-      88,
-      89
+      89,
+      90,
+      91
     ]
   },
   {
     "teal": 49,
     "source": 40,
     "pc": [
-      90
+      92
     ]
   },
   {
     "teal": 50,
     "source": 40,
     "pc": [
-      91
+      93
     ]
   },
   {
     "teal": 62,
     "source": 40,
     "pc": [
-      92,
-      93,
-      94
+      94,
+      95,
+      96
     ]
   },
   {
     "teal": 65,
     "source": 40,
     "pc": [
-      95
+      97
     ]
   },
   {
     "teal": 66,
     "source": 40,
     "pc": [
-      96,
-      97
+      98,
+      99
     ]
   },
   {
     "teal": 70,
     "source": 41,
     "pc": [
-      98
+      100
     ]
   },
   {
     "teal": 71,
     "source": 41,
     "pc": [
-      99
+      101
     ]
   },
   {
     "teal": 72,
     "source": 41,
     "pc": [
-      100,
-      101
+      102,
+      103
     ]
   },
   {
     "teal": 76,
     "source": 42,
     "pc": [
-      102,
-      103
+      104,
+      105
     ]
   },
   {
     "teal": 77,
     "source": 42,
     "pc": [
-      104,
-      105
+      106,
+      107
     ]
   },
   {
     "teal": 78,
     "source": 42,
     "pc": [
-      106
+      108
     ]
   },
   {
     "teal": 79,
     "source": 42,
     "pc": [
-      107
+      109
     ]
   },
   {
     "teal": 80,
     "source": 42,
     "pc": [
-      108
+      110
     ]
   },
   {
     "teal": 81,
     "source": 42,
     "pc": [
-      109,
-      110
+      111,
+      112
     ]
   },
   {
     "teal": 90,
     "source": 45,
     "pc": [
-      111,
-      112
+      113,
+      114
     ]
   },
   {
     "teal": 91,
     "source": 45,
     "pc": [
-      113
+      115
     ]
   },
   {
     "teal": 92,
     "source": 46,
     "pc": [
-      114,
-      115
+      116,
+      117
     ]
   },
   {
     "teal": 93,
     "source": 46,
     "pc": [
-      116
+      118
     ]
   },
   {
     "teal": 94,
     "source": 46,
     "pc": [
-      117
+      119
     ]
   },
   {
     "teal": 95,
     "source": 47,
     "pc": [
-      118,
-      119,
-      120
+      120,
+      121,
+      122
     ]
   },
   {
     "teal": 96,
     "source": 47,
     "pc": [
-      121
+      123
     ]
   },
   {
     "teal": 97,
     "source": 48,
     "pc": [
-      122,
-      123
+      124,
+      125
     ]
   },
   {
     "teal": 98,
     "source": 48,
     "pc": [
-      124
+      126
     ]
   },
   {
     "teal": 99,
     "source": 48,
     "pc": [
-      125
+      127
     ]
   },
   {
     "teal": 100,
     "source": 44,
     "pc": [
-      126,
-      127
+      128,
+      129
     ]
   },
   {
     "teal": 104,
     "source": 51,
     "pc": [
-      128,
-      129
+      130,
+      131
     ]
   },
   {
     "teal": 105,
     "source": 51,
     "pc": [
-      130
+      132
     ]
   },
   {
     "teal": 106,
     "source": 51,
     "pc": [
-      131
+      133
     ]
   },
   {
     "teal": 107,
     "source": 51,
     "pc": [
-      132
+      134
     ]
   },
   {
     "teal": 108,
     "source": 51,
     "pc": [
-      133
+      135
     ]
   },
   {
     "teal": 109,
     "source": 51,
     "pc": [
-      134
+      136
     ]
   },
   {
     "teal": 113,
     "source": 53,
     "pc": [
-      135,
-      136
+      137,
+      138
     ]
   },
   {
     "teal": 114,
     "source": 53,
     "pc": [
-      137,
-      138
+      139,
+      140
     ]
   },
   {
     "teal": 115,
     "source": 53,
     "pc": [
-      139
+      141
     ]
   },
   {
     "teal": 119,
     "source": 55,
     "pc": [
-      140
+      142
     ]
   },
   {
     "teal": 120,
     "source": 55,
     "pc": [
-      141,
-      142
+      143,
+      144
     ]
   },
   {
     "teal": 121,
     "source": 55,
     "pc": [
-      143
+      145
     ]
   },
   {
     "teal": 122,
     "source": 55,
     "pc": [
-      144
+      146
     ]
   },
   {
     "teal": 123,
     "source": 55,
     "pc": [
-      145
+      147
     ]
   },
   {
     "teal": 131,
     "source": 58,
     "pc": [
-      146,
-      147
+      148,
+      149
     ]
   },
   {
     "teal": 132,
     "source": 16,
     "pc": [
-      148,
-      149,
-      150
+      150,
+      151,
+      152
     ]
   },
   {
     "teal": 133,
     "source": 58,
     "pc": [
-      151
+      153
     ]
   },
   {
     "teal": 134,
     "source": 59,
     "pc": [
-      152,
-      153
+      154,
+      155
     ]
   },
   {
     "teal": 135,
     "source": 59,
     "pc": [
-      154
+      156
     ]
   },
   {
     "teal": 136,
     "source": 59,
     "pc": [
-      155
+      157
     ]
   },
   {
     "teal": 137,
     "source": 17,
     "pc": [
-      156
+      158,
+      159
     ]
   },
   {
     "teal": 138,
     "source": 59,
     "pc": [
-      157
+      160
     ]
   },
   {
     "teal": 139,
     "source": 15,
     "pc": [
-      158
+      161
     ]
   },
   {
     "teal": 140,
     "source": 59,
     "pc": [
-      159
+      162
     ]
   },
   {
     "teal": 141,
     "source": 58,
     "pc": [
-      160
+      163
     ]
   },
   {
     "teal": 142,
     "source": 60,
     "pc": [
-      161,
-      162
+      164,
+      165
     ]
   },
   {
     "teal": 143,
     "source": 60,
     "pc": [
-      163,
-      164
+      166,
+      167
     ]
   },
   {
     "teal": 144,
     "source": 60,
     "pc": [
-      165
+      168
     ]
   },
   {
     "teal": 145,
     "source": 15,
     "pc": [
-      166
+      169
     ]
   },
   {
     "teal": 146,
     "source": 60,
     "pc": [
-      167
+      170
     ]
   },
   {
     "teal": 147,
     "source": 59,
     "pc": [
-      168
+      171
     ]
   },
   {
     "teal": 148,
     "source": 61,
     "pc": [
-      169,
-      170
+      172,
+      173
     ]
   },
   {
     "teal": 149,
     "source": 15,
     "pc": [
-      171
+      174
     ]
   },
   {
     "teal": 150,
     "source": 61,
     "pc": [
-      172
+      175
     ]
   },
   {
     "teal": 151,
     "source": 60,
     "pc": [
-      173
+      176
     ]
   },
   {
     "teal": 152,
     "source": 57,
     "pc": [
-      174,
-      175
+      177,
+      178
     ]
   },
   {
     "teal": 157,
     "source": 63,
     "pc": [
-      176,
-      177
+      179,
+      180
     ]
   },
   {
     "teal": 158,
     "source": 63,
     "pc": [
-      178,
-      179
+      181,
+      182
     ]
   },
   {
     "teal": 159,
     "source": 63,
     "pc": [
-      180,
-      181
+      183,
+      184
     ]
   },
   {
     "teal": 160,
     "source": 63,
     "pc": [
-      182
+      185
     ]
   },
   {
     "teal": 161,
     "source": 63,
     "pc": [
-      183
+      186
     ]
   },
   {
     "teal": 164,
     "source": 63,
     "pc": [
-      184,
-      185
+      187,
+      188
     ]
   },
   {
     "teal": 165,
     "source": 63,
     "pc": [
-      186,
-      187
+      189,
+      190
     ]
   },
   {
     "teal": 166,
     "source": 63,
     "pc": [
-      188,
-      189
+      191,
+      192
     ]
   },
   {
     "teal": 167,
     "source": 63,
     "pc": [
-      190
+      193
     ]
   },
   {
     "teal": 168,
     "source": 63,
     "pc": [
-      191
+      194
     ]
   },
   {
     "teal": 169,
     "source": 40,
     "pc": [
-      192
-    ]
-  },
-  {
-    "teal": 173,
-    "source": 75,
-    "pc": [
-      193,
-      194,
       195
     ]
   },
   {
-    "teal": 174,
+    "teal": 173,
     "source": 75,
     "pc": [
       196,
@@ -787,7 +781,7 @@
     ]
   },
   {
-    "teal": 177,
+    "teal": 174,
     "source": 75,
     "pc": [
       199,
@@ -796,39 +790,39 @@
     ]
   },
   {
-    "teal": 178,
+    "teal": 177,
     "source": 75,
     "pc": [
-      202
+      202,
+      203,
+      204
     ]
   },
   {
-    "teal": 181,
+    "teal": 178,
     "source": 75,
     "pc": [
-      203,
-      204,
       205
     ]
   },
   {
-    "teal": 182,
+    "teal": 181,
     "source": 75,
     "pc": [
-      206
+      206,
+      207,
+      208
     ]
   },
   {
-    "teal": 185,
+    "teal": 182,
     "source": 75,
     "pc": [
-      207,
-      208,
       209
     ]
   },
   {
-    "teal": 186,
+    "teal": 185,
     "source": 75,
     "pc": [
       210,
@@ -837,7 +831,7 @@
     ]
   },
   {
-    "teal": 189,
+    "teal": 186,
     "source": 75,
     "pc": [
       213,
@@ -845,139 +839,145 @@
       215
     ]
   },
+  {
+    "teal": 189,
+    "source": 75,
+    "pc": [
+      216,
+      217,
+      218
+    ]
+  },
   {
     "teal": 190,
     "source": 75,
     "pc": [
-      216
+      219
     ]
   },
   {
     "teal": 191,
     "source": 75,
     "pc": [
-      217
+      220
     ]
   },
   {
     "teal": 203,
     "source": 75,
     "pc": [
-      218,
-      219,
-      220
+      221,
+      222,
+      223
     ]
   },
   {
     "teal": 206,
     "source": 75,
     "pc": [
-      221
+      224
     ]
   },
   {
     "teal": 210,
     "source": 76,
     "pc": [
-      222,
-      223
+      225,
+      226
     ]
   },
   {
     "teal": 211,
     "source": 76,
     "pc": [
-      224,
-      225
+      227,
+      228
     ]
   },
   {
     "teal": 215,
     "source": 76,
     "pc": [
-      226,
-      227
+      229,
+      230
     ]
   },
   {
     "teal": 216,
     "source": 76,
     "pc": [
-      228
+      231,
+      232
     ]
   },
   {
     "teal": 217,
     "source": 76,
     "pc": [
-      229
+      233
     ]
   },
   {
     "teal": 218,
-    "source": 77,
+    "source": 76,
     "pc": [
-      230,
-      231,
-      232
+      234
     ]
   },
   {
     "teal": 219,
     "source": 77,
     "pc": [
-      233
+      235
     ]
   },
   {
     "teal": 220,
     "source": 11,
     "pc": [
-      234
+      236
     ]
   },
   {
     "teal": 221,
     "source": 77,
     "pc": [
-      235
+      237
     ]
   },
   {
     "teal": 222,
     "source": 77,
     "pc": [
-      236
+      238
     ]
   },
   {
     "teal": 226,
     "source": 76,
     "pc": [
-      237,
-      238
+      239,
+      240
     ]
   },
   {
     "teal": 227,
     "source": 76,
     "pc": [
-      239
+      241
     ]
   },
   {
     "teal": 228,
     "source": 76,
     "pc": [
-      240
+      242
     ]
   },
   {
     "teal": 229,
-    "source": 78,
+    "source": 76,
     "pc": [
-      241,
-      242,
       243
     ]
   },
@@ -1051,737 +1051,739 @@
   },
   {
     "teal": 239,
-    "source": 78,
+    "source": 76,
     "pc": [
-      258,
-      259,
-      260
+      258
     ]
   },
   {
     "teal": 240,
     "source": 78,
     "pc": [
-      261
+      259
     ]
   },
   {
     "teal": 241,
     "source": 78,
     "pc": [
-      262
+      260
     ]
   },
   {
     "teal": 242,
     "source": 78,
     "pc": [
-      263
+      261
     ]
   },
   {
     "teal": 245,
     "source": 78,
     "pc": [
-      264
+      262
     ]
   },
   {
     "teal": 250,
     "source": 80,
     "pc": [
-      265,
-      266
+      263,
+      264
     ]
   },
   {
     "teal": 251,
     "source": 80,
     "pc": [
-      267
+      265
     ]
   },
   {
     "teal": 252,
     "source": 80,
     "pc": [
-      268
+      266
     ]
   },
   {
     "teal": 253,
     "source": 80,
     "pc": [
-      269,
-      270,
-      271
+      267,
+      268,
+      269
     ]
   },
   {
     "teal": 258,
     "source": 81,
     "pc": [
-      272,
-      273
+      270,
+      271
     ]
   },
   {
     "teal": 259,
     "source": 81,
     "pc": [
-      274
+      272
     ]
   },
   {
     "teal": 260,
     "source": 81,
     "pc": [
-      275,
-      276
+      273,
+      274
     ]
   },
   {
     "teal": 261,
     "source": 76,
     "pc": [
-      277,
-      278
+      275,
+      276
     ]
   },
   {
     "teal": 262,
     "source": 76,
     "pc": [
-      279
+      277
     ]
   },
   {
     "teal": 263,
     "source": 76,
     "pc": [
-      280
+      278
     ]
   },
   {
     "teal": 264,
-    "source": 81,
+    "source": 76,
     "pc": [
-      281,
-      282,
-      283
+      279
     ]
   },
   {
     "teal": 265,
     "source": 81,
     "pc": [
-      284
+      280
     ]
   },
   {
     "teal": 266,
     "source": 81,
     "pc": [
-      285
+      281
     ]
   },
   {
     "teal": 267,
     "source": 81,
     "pc": [
-      286,
-      287,
-      288
+      282,
+      283,
+      284
     ]
   },
   {
     "teal": 268,
     "source": 76,
     "pc": [
-      289,
-      290
+      285,
+      286
     ]
   },
   {
     "teal": 269,
     "source": 76,
     "pc": [
-      291
+      287,
+      288
     ]
   },
   {
     "teal": 270,
     "source": 76,
     "pc": [
-      292
+      289
     ]
   },
   {
     "teal": 271,
-    "source": 81,
+    "source": 76,
     "pc": [
-      293,
-      294,
-      295
+      290
     ]
   },
   {
     "teal": 272,
     "source": 81,
     "pc": [
-      296
+      291
     ]
   },
   {
     "teal": 273,
     "source": 81,
     "pc": [
-      297,
-      298,
-      299
+      292,
+      293,
+      294
     ]
   },
   {
     "teal": 276,
     "source": 17,
     "pc": [
-      300
+      295,
+      296
     ]
   },
   {
     "teal": 279,
     "source": 81,
     "pc": [
-      301
+      297
     ]
   },
   {
-    "teal": 284,
-    "source": 84,
+    "teal": 280,
+    "source": 81,
     "pc": [
-      302,
-      303
+      298
     ]
   },
   {
     "teal": 285,
     "source": 84,
     "pc": [
-      304
+      299,
+      300
     ]
   },
   {
     "teal": 286,
     "source": 84,
     "pc": [
-      305,
-      306
+      301
     ]
   },
   {
     "teal": 287,
     "source": 84,
     "pc": [
-      307,
-      308
+      302,
+      303
     ]
   },
   {
     "teal": 288,
     "source": 84,
     "pc": [
-      309
+      304,
+      305
     ]
   },
   {
     "teal": 289,
-    "source": 75,
+    "source": 84,
     "pc": [
-      310
+      306
     ]
   },
   {
-    "teal": 293,
-    "source": 94,
+    "teal": 290,
+    "source": 75,
     "pc": [
-      311,
-      312,
-      313
+      307
     ]
   },
   {
     "teal": 294,
     "source": 94,
     "pc": [
-      314
+      308,
+      309,
+      310
     ]
   },
   {
     "teal": 295,
     "source": 94,
     "pc": [
-      315
+      311
     ]
   },
   {
     "teal": 296,
     "source": 94,
     "pc": [
-      316
+      312
     ]
   },
   {
     "teal": 297,
     "source": 94,
     "pc": [
-      317
+      313
     ]
   },
   {
     "teal": 298,
     "source": 94,
     "pc": [
-      318
+      314
     ]
   },
   {
     "teal": 299,
     "source": 94,
     "pc": [
-      319
+      315
     ]
   },
   {
-    "teal": 302,
+    "teal": 300,
     "source": 94,
     "pc": [
-      320,
-      321,
-      322
+      316
     ]
   },
   {
     "teal": 303,
     "source": 94,
     "pc": [
-      323,
-      324,
-      325
+      317,
+      318,
+      319
     ]
   },
   {
-    "teal": 306,
+    "teal": 304,
     "source": 94,
     "pc": [
-      326,
-      327,
-      328
+      320,
+      321,
+      322
     ]
   },
   {
     "teal": 307,
     "source": 94,
     "pc": [
-      329
+      323,
+      324,
+      325
     ]
   },
   {
     "teal": 308,
     "source": 94,
     "pc": [
-      330
+      326
     ]
   },
   {
-    "teal": 318,
+    "teal": 309,
     "source": 94,
     "pc": [
-      331,
-      332,
-      333
+      327
     ]
   },
   {
-    "teal": 321,
+    "teal": 319,
     "source": 94,
     "pc": [
-      334
+      328,
+      329,
+      330
     ]
   },
   {
-    "teal": 325,
-    "source": 95,
+    "teal": 322,
+    "source": 94,
     "pc": [
-      335,
-      336
+      331
     ]
   },
   {
     "teal": 326,
     "source": 95,
     "pc": [
-      337
+      332,
+      333
     ]
   },
   {
     "teal": 327,
     "source": 95,
     "pc": [
-      338
+      334,
+      335
     ]
   },
   {
     "teal": 328,
     "source": 95,
     "pc": [
-      339,
-      340,
-      341
+      336
     ]
   },
   {
     "teal": 329,
     "source": 95,
     "pc": [
-      342
+      337
     ]
   },
   {
     "teal": 330,
     "source": 95,
     "pc": [
-      343,
-      344
+      338
     ]
   },
   {
-    "teal": 334,
-    "source": 97,
+    "teal": 331,
+    "source": 95,
     "pc": [
-      345,
-      346
+      339,
+      340
     ]
   },
   {
     "teal": 335,
-    "source": 12,
+    "source": 97,
     "pc": [
-      347
+      341,
+      342
     ]
   },
   {
     "teal": 336,
-    "source": 97,
+    "source": 12,
     "pc": [
-      348
+      343
     ]
   },
   {
     "teal": 337,
     "source": 97,
     "pc": [
-      349
+      344
     ]
   },
   {
     "teal": 338,
     "source": 97,
     "pc": [
-      350,
-      351,
-      352
+      345
     ]
   },
   {
     "teal": 339,
     "source": 97,
     "pc": [
-      353,
-      354
+      346,
+      347,
+      348
     ]
   },
   {
     "teal": 340,
-    "source": 13,
+    "source": 97,
     "pc": [
-      355,
-      356
+      349,
+      350
     ]
   },
   {
     "teal": 341,
-    "source": 97,
+    "source": 13,
     "pc": [
-      357
+      351,
+      352
     ]
   },
   {
     "teal": 342,
     "source": 97,
     "pc": [
-      358
+      353
     ]
   },
   {
-    "teal": 345,
+    "teal": 343,
     "source": 97,
     "pc": [
-      359
+      354
     ]
   },
   {
     "teal": 346,
     "source": 97,
     "pc": [
-      360,
-      361,
-      362
+      355
     ]
   },
   {
     "teal": 347,
     "source": 97,
     "pc": [
-      363,
-      364
+      356,
+      357,
+      358
     ]
   },
   {
     "teal": 348,
-    "source": 11,
+    "source": 97,
     "pc": [
-      365
+      359,
+      360
     ]
   },
   {
     "teal": 349,
-    "source": 97,
+    "source": 11,
     "pc": [
-      366
+      361
     ]
   },
   {
     "teal": 350,
     "source": 97,
     "pc": [
-      367
+      362
     ]
   },
   {
-    "teal": 353,
+    "teal": 351,
     "source": 97,
     "pc": [
-      368
+      363
     ]
   },
   {
-    "teal": 357,
-    "source": 98,
+    "teal": 354,
+    "source": 97,
     "pc": [
-      369,
-      370
+      364
     ]
   },
   {
     "teal": 358,
-    "source": 13,
+    "source": 98,
     "pc": [
-      371,
-      372
+      365,
+      366
     ]
   },
   {
     "teal": 359,
-    "source": 98,
+    "source": 13,
     "pc": [
-      373
+      367,
+      368
     ]
   },
   {
     "teal": 360,
     "source": 98,
     "pc": [
-      374
+      369
     ]
   },
   {
-    "teal": 364,
-    "source": 100,
+    "teal": 361,
+    "source": 98,
     "pc": [
-      375,
-      376
+      370
     ]
   },
   {
     "teal": 365,
     "source": 100,
     "pc": [
-      377,
-      378
+      371,
+      372
     ]
   },
   {
     "teal": 366,
     "source": 100,
     "pc": [
-      379
+      373,
+      374
     ]
   },
   {
     "teal": 367,
     "source": 100,
     "pc": [
-      380,
-      381,
-      382
+      375
     ]
   },
   {
     "teal": 368,
     "source": 100,
     "pc": [
-      383,
-      384
+      376,
+      377,
+      378
     ]
   },
   {
     "teal": 369,
     "source": 100,
     "pc": [
-      385,
-      386
+      379,
+      380
     ]
   },
   {
     "teal": 370,
     "source": 100,
     "pc": [
-      387
+      381,
+      382
     ]
   },
   {
     "teal": 371,
+    "source": 100,
+    "pc": [
+      383
+    ]
+  },
+  {
+    "teal": 372,
     "source": 94,
     "pc": [
-      388
+      384
     ]
   },
   {
-    "teal": 374,
+    "teal": 375,
     "source": 20,
     "pc": [
-      389
+      385
     ]
   },
   {
-    "teal": 375,
+    "teal": 376,
     "source": 20,
     "pc": [
-      390
+      386
     ]
   },
   {
-    "teal": 378,
+    "teal": 379,
     "source": 20,
     "pc": [
+      387,
+      388,
+      389,
+      390,
       391,
-      392,
+      392
+    ]
+  },
+  {
+    "teal": 380,
+    "source": 20,
+    "pc": [
       393,
       394,
-      395,
-      396
+      395
     ]
   },
   {
-    "teal": 379,
+    "teal": 381,
     "source": 20,
     "pc": [
+      396,
       397,
       398,
       399
     ]
   },
   {
-    "teal": 380,
+    "teal": 382,
     "source": 20,
     "pc": [
-      400,
-      401,
-      402,
-      403
+      400
     ]
   },
   {
-    "teal": 381,
+    "teal": 385,
     "source": 20,
     "pc": [
-      404
+      401,
+      402,
+      403,
+      404,
+      405,
+      406
     ]
   },
   {
-    "teal": 384,
+    "teal": 386,
     "source": 20,
     "pc": [
-      405,
-      406,
       407,
       408,
       409,
-      410
+      410,
+      411,
+      412
     ]
   },
   {
-    "teal": 385,
+    "teal": 387,
     "source": 20,
     "pc": [
-      411,
-      412,
       413,
       414,
       415,
-      416
+      416,
+      417,
+      418
     ]
   },
   {
-    "teal": 386,
+    "teal": 388,
     "source": 20,
     "pc": [
-      417,
-      418,
       419,
       420,
-      421,
-      422
+      421
     ]
   },
   {
-    "teal": 387,
+    "teal": 389,
     "source": 20,
     "pc": [
+      422,
       423,
       424,
-      425
-    ]
-  },
-  {
-    "teal": 388,
-    "source": 20,
-    "pc": [
+      425,
       426,
       427,
       428,
-      429,
-      430,
-      431,
-      432,
-      433
+      429
     ]
   },
   {
-    "teal": 389,
+    "teal": 390,
     "source": 20,
     "pc": [
-      434
+      430
     ]
   }
 ]
\ No newline at end of file
diff --git a/examples/merkle/artifacts/MerkleTree.approval.teal b/examples/merkle/artifacts/MerkleTree.approval.teal
index 46b4f54d4..eb9e2cc41 100644
--- a/examples/merkle/artifacts/MerkleTree.approval.teal
+++ b/examples/merkle/artifacts/MerkleTree.approval.teal
@@ -134,14 +134,9 @@ for_1:
 	// examples/merkle/merkle.algo.ts:40
 	// this.isRightSibling(elem)
 	frame_dig -2 // path: Path
-	store 255 // full array
-	int 0 // initial offset
 	frame_dig 1 // saved accessor: accessor//0//elem
 	int 33
 	* // acc * typeLength
-	+
-	load 255 // full array
-	swap
 	int 33
 	extract3
 	callsub isRightSibling
@@ -151,14 +146,9 @@ for_1:
 	// examples/merkle/merkle.algo.ts:41
 	// result = this.hashConcat(result, extract3(elem, 1, 32) as bytes32)
 	frame_dig -2 // path: Path
-	store 255 // full array
-	int 0 // initial offset
 	frame_dig 1 // saved accessor: accessor//0//elem
 	int 33
 	* // acc * typeLength
-	+
-	load 255 // full array
-	swap
 	int 33
 	extract3
 	extract 1 32
@@ -180,14 +170,9 @@ if0_else:
 	// result = this.hashConcat(extract3(elem, 1, 32) as bytes32, result)
 	frame_dig -1 // leaf: bytes32
 	frame_dig -2 // path: Path
-	store 255 // full array
-	int 0 // initial offset
 	frame_dig 1 // saved accessor: accessor//0//elem
 	int 33
 	* // acc * typeLength
-	+
-	load 255 // full array
-	swap
 	int 33
 	extract3
 	extract 1 32
diff --git a/examples/merkle/artifacts/MerkleTree.arc32.json b/examples/merkle/artifacts/MerkleTree.arc32.json
index 58b5019f6..1086682f5 100644
--- a/examples/merkle/artifacts/MerkleTree.arc32.json
+++ b/examples/merkle/artifacts/MerkleTree.arc32.json
@@ -63,7 +63,7 @@
     }
   },
   "source": {
-    "approval": "#pragma version 9

// This TEAL was generated by TEALScript v0.74.0
// https://github.com/algorandfoundation/TEALScript

// This contract is compliant with and/or implements the following ARCs: [ ARC4 ]

// The following ten lines of TEAL handle initial program flow
// This pattern is used to make it easy for anyone to parse the start of the program and determine if a specific action is allowed
// Here, action refers to the OnComplete in combination with whether the app is being created or called
// Every possible action for this contract is represented in the switch statement
// If the action is not implmented in the contract, its respective branch will be "NOT_IMPLEMENTED" which just contains "err"
txn ApplicationID
!
int 6
*
txn OnCompletion
+
switch call_NoOp NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED call_DeleteApplication create_NoOp NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED

NOT_IMPLEMENTED:
	err

// calcInitRoot()byte[32]
calcInitRoot:
	proto 0 1

	// Push empty bytes after the frame pointer to reserve space for local variables
	byte 0x
	dup

	// examples/merkle/merkle.algo.ts:17
	// result = EMPTY_HASH
	// examples/merkle/merkle.algo.ts:4
	// hex('e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855')
	byte 0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b8550000000000000000000000000000000000000000000000000000000000000000
	byte 0x
	dup
	b==
	assert
	extract 0 32
	frame_bury 0 // result: byte[32]

	// examples/merkle/merkle.algo.ts:19
	// i = 0
	int 0
	frame_bury 1 // i: uint64

for_0:
	// examples/merkle/merkle.algo.ts:19
	// i < TREE_DEPTH
	frame_dig 1 // i: uint64
	int 3
	<
	bz for_0_end

	// examples/merkle/merkle.algo.ts:20
	// result = sha256(result + result)
	frame_dig 0 // result: byte[32]
	frame_dig 0 // result: byte[32]
	concat
	sha256
	frame_bury 0 // result: byte[32]

	// examples/merkle/merkle.algo.ts:19
	// i = i + 1
	frame_dig 1 // i: uint64
	int 1
	+
	frame_bury 1 // i: uint64
	b for_0

for_0_end:
	// examples/merkle/merkle.algo.ts:23
	// return result;
	frame_dig 0 // result: byte[32]

	// set the subroutine return value
	frame_bury 0

	// pop all local variables from the stack
	popn 1
	retsub

// hashConcat(byte[32],byte[32])byte[32]
hashConcat:
	proto 2 1

	// examples/merkle/merkle.algo.ts:27
	// return sha256(left + right);
	frame_dig -1 // left: bytes32
	frame_dig -2 // right: bytes32
	concat
	sha256
	retsub

// isRightSibling(byte[33])bool
isRightSibling:
	proto 1 1

	// examples/merkle/merkle.algo.ts:31
	// return getbyte(elem, 0) === RIGHT_SIBLING_PREFIX;
	frame_dig -1 // elem: Branch
	int 0
	getbyte
	int 170
	==
	retsub

// calcRoot(byte[33][3],byte[32])byte[32]
calcRoot:
	proto 2 1

	// Push empty bytes after the frame pointer to reserve space for local variables
	byte 0x
	dup

	// examples/merkle/merkle.algo.ts:37
	// i = 0
	int 0
	frame_bury 0 // i: uint64

for_1:
	// examples/merkle/merkle.algo.ts:37
	// i < TREE_DEPTH
	frame_dig 0 // i: uint64
	int 3
	<
	bz for_1_end
	frame_dig 0 // i: uint64
	frame_bury 1 // accessor: accessor//0//elem

	// if0_condition
	// examples/merkle/merkle.algo.ts:40
	// this.isRightSibling(elem)
	frame_dig -2 // path: Path
	store 255 // full array
	int 0 // initial offset
	frame_dig 1 // saved accessor: accessor//0//elem
	int 33
	* // acc * typeLength
	+
	load 255 // full array
	swap
	int 33
	extract3
	callsub isRightSibling
	bz if0_else

	// if0_consequent
	// examples/merkle/merkle.algo.ts:41
	// result = this.hashConcat(result, extract3(elem, 1, 32) as bytes32)
	frame_dig -2 // path: Path
	store 255 // full array
	int 0 // initial offset
	frame_dig 1 // saved accessor: accessor//0//elem
	int 33
	* // acc * typeLength
	+
	load 255 // full array
	swap
	int 33
	extract3
	extract 1 32
	byte 0x0000000000000000000000000000000000000000000000000000000000000000
	concat
	dup
	extract 32 0
	byte 0x
	b==
	assert
	extract 0 32
	frame_dig -1 // leaf: bytes32
	callsub hashConcat
	frame_bury -1 // result: bytes32
	b if0_end

if0_else:
	// examples/merkle/merkle.algo.ts:43
	// result = this.hashConcat(extract3(elem, 1, 32) as bytes32, result)
	frame_dig -1 // leaf: bytes32
	frame_dig -2 // path: Path
	store 255 // full array
	int 0 // initial offset
	frame_dig 1 // saved accessor: accessor//0//elem
	int 33
	* // acc * typeLength
	+
	load 255 // full array
	swap
	int 33
	extract3
	extract 1 32
	byte 0x0000000000000000000000000000000000000000000000000000000000000000
	concat
	dup
	extract 32 0
	byte 0x
	b==
	assert
	extract 0 32
	callsub hashConcat
	frame_bury -1 // result: bytes32

if0_end:
	// examples/merkle/merkle.algo.ts:37
	// i = i + 1
	frame_dig 0 // i: uint64
	int 1
	+
	frame_bury 0 // i: uint64
	b for_1

for_1_end:
	// examples/merkle/merkle.algo.ts:47
	// return result;
	frame_dig -1 // leaf: bytes32

	// set the subroutine return value
	frame_bury 0

	// pop all local variables from the stack
	popn 1
	retsub

abi_route_deleteApplication:
	// execute deleteApplication()void
	callsub deleteApplication
	int 1
	return

// deleteApplication()void
deleteApplication:
	proto 0 0

	// examples/merkle/merkle.algo.ts:51
	// verifyAppCallTxn(this.txn, { sender: this.app.creator })
	// verify sender
	txn Sender
	txna Applications 0
	app_params_get AppCreator
	assert
	==
	assert
	retsub

abi_route_createApplication:
	// execute createApplication()void
	callsub createApplication
	int 1
	return

// createApplication()void
createApplication:
	proto 0 0

	// examples/merkle/merkle.algo.ts:55
	// this.root.value = this.calcInitRoot()
	byte 0x726f6f74 // "root"
	callsub calcInitRoot
	app_global_put
	retsub

abi_route_verify:
	// path: byte[33][3]
	txna ApplicationArgs 2
	dup
	len
	int 99
	==
	assert

	// data: byte[]
	txna ApplicationArgs 1
	extract 2 0

	// execute verify(byte[33][3],byte[])void
	callsub verify
	int 1
	return

// verify(byte[33][3],byte[])void
verify:
	proto 2 0

	// examples/merkle/merkle.algo.ts:59
	// assert(this.root.value === this.calcRoot(sha256(data), path))
	byte 0x726f6f74 // "root"
	app_global_get
	frame_dig -2 // path: Path
	frame_dig -1 // data: bytes
	sha256
	callsub calcRoot
	==
	assert
	retsub

abi_route_appendLeaf:
	// path: byte[33][3]
	txna ApplicationArgs 2
	dup
	len
	int 99
	==
	assert

	// data: byte[]
	txna ApplicationArgs 1
	extract 2 0

	// execute appendLeaf(byte[33][3],byte[])void
	callsub appendLeaf
	int 1
	return

// appendLeaf(byte[33][3],byte[])void
appendLeaf:
	proto 2 0

	// examples/merkle/merkle.algo.ts:63
	// assert(data !== '')
	frame_dig -1 // data: bytes
	byte 0x // ""
	!=
	assert

	// examples/merkle/merkle.algo.ts:64
	// assert(this.root.value === this.calcRoot(EMPTY_HASH, path))
	byte 0x726f6f74 // "root"
	app_global_get
	frame_dig -2 // path: Path

	// examples/merkle/merkle.algo.ts:4
	// hex('e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855')
	byte 0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b8550000000000000000000000000000000000000000000000000000000000000000
	byte 0x
	dup
	b==
	assert
	extract 0 32
	callsub calcRoot
	==
	assert

	// examples/merkle/merkle.algo.ts:66
	// this.root.value = this.calcRoot(sha256(data), path)
	byte 0x726f6f74 // "root"
	frame_dig -2 // path: Path
	frame_dig -1 // data: bytes
	sha256
	callsub calcRoot
	app_global_put

	// examples/merkle/merkle.algo.ts:68
	// this.size.value = this.size.value + 1
	byte 0x73697a65 // "size"
	dup
	app_global_get
	int 1
	+
	app_global_put
	retsub

abi_route_updateLeaf:
	// path: byte[33][3]
	txna ApplicationArgs 3
	dup
	len
	int 99
	==
	assert

	// newData: byte[]
	txna ApplicationArgs 2
	extract 2 0

	// oldData: byte[]
	txna ApplicationArgs 1
	extract 2 0

	// execute updateLeaf(byte[33][3],byte[],byte[])void
	callsub updateLeaf
	int 1
	return

// updateLeaf(byte[33][3],byte[],byte[])void
updateLeaf:
	proto 3 0

	// examples/merkle/merkle.algo.ts:72
	// assert(newData !== '')
	frame_dig -2 // newData: bytes
	byte 0x // ""
	!=
	assert

	// examples/merkle/merkle.algo.ts:73
	// assert(this.root.value === this.calcRoot(sha256(oldData), path))
	byte 0x726f6f74 // "root"
	app_global_get
	frame_dig -3 // path: Path
	frame_dig -1 // oldData: bytes
	sha256
	callsub calcRoot
	==
	assert

	// examples/merkle/merkle.algo.ts:75
	// this.root.value = this.calcRoot(sha256(newData), path)
	byte 0x726f6f74 // "root"
	frame_dig -3 // path: Path
	frame_dig -2 // newData: bytes
	sha256
	callsub calcRoot
	app_global_put
	retsub

create_NoOp:
	method "createApplication()void"
	txna ApplicationArgs 0
	match abi_route_createApplication
	err

call_NoOp:
	method "verify(byte[],byte[33][3])void"
	method "appendLeaf(byte[],byte[33][3])void"
	method "updateLeaf(byte[],byte[],byte[33][3])void"
	txna ApplicationArgs 0
	match abi_route_verify abi_route_appendLeaf abi_route_updateLeaf
	err

call_DeleteApplication:
	method "deleteApplication()void"
	txna ApplicationArgs 0
	match abi_route_deleteApplication
	err",
+    "approval": "#pragma version 9

// This TEAL was generated by TEALScript v0.74.0
// https://github.com/algorandfoundation/TEALScript

// This contract is compliant with and/or implements the following ARCs: [ ARC4 ]

// The following ten lines of TEAL handle initial program flow
// This pattern is used to make it easy for anyone to parse the start of the program and determine if a specific action is allowed
// Here, action refers to the OnComplete in combination with whether the app is being created or called
// Every possible action for this contract is represented in the switch statement
// If the action is not implmented in the contract, its respective branch will be "NOT_IMPLEMENTED" which just contains "err"
txn ApplicationID
!
int 6
*
txn OnCompletion
+
switch call_NoOp NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED call_DeleteApplication create_NoOp NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED

NOT_IMPLEMENTED:
	err

// calcInitRoot()byte[32]
calcInitRoot:
	proto 0 1

	// Push empty bytes after the frame pointer to reserve space for local variables
	byte 0x
	dup

	// examples/merkle/merkle.algo.ts:17
	// result = EMPTY_HASH
	// examples/merkle/merkle.algo.ts:4
	// hex('e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855')
	byte 0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b8550000000000000000000000000000000000000000000000000000000000000000
	byte 0x
	dup
	b==
	assert
	extract 0 32
	frame_bury 0 // result: byte[32]

	// examples/merkle/merkle.algo.ts:19
	// i = 0
	int 0
	frame_bury 1 // i: uint64

for_0:
	// examples/merkle/merkle.algo.ts:19
	// i < TREE_DEPTH
	frame_dig 1 // i: uint64
	int 3
	<
	bz for_0_end

	// examples/merkle/merkle.algo.ts:20
	// result = sha256(result + result)
	frame_dig 0 // result: byte[32]
	frame_dig 0 // result: byte[32]
	concat
	sha256
	frame_bury 0 // result: byte[32]

	// examples/merkle/merkle.algo.ts:19
	// i = i + 1
	frame_dig 1 // i: uint64
	int 1
	+
	frame_bury 1 // i: uint64
	b for_0

for_0_end:
	// examples/merkle/merkle.algo.ts:23
	// return result;
	frame_dig 0 // result: byte[32]

	// set the subroutine return value
	frame_bury 0

	// pop all local variables from the stack
	popn 1
	retsub

// hashConcat(byte[32],byte[32])byte[32]
hashConcat:
	proto 2 1

	// examples/merkle/merkle.algo.ts:27
	// return sha256(left + right);
	frame_dig -1 // left: bytes32
	frame_dig -2 // right: bytes32
	concat
	sha256
	retsub

// isRightSibling(byte[33])bool
isRightSibling:
	proto 1 1

	// examples/merkle/merkle.algo.ts:31
	// return getbyte(elem, 0) === RIGHT_SIBLING_PREFIX;
	frame_dig -1 // elem: Branch
	int 0
	getbyte
	int 170
	==
	retsub

// calcRoot(byte[33][3],byte[32])byte[32]
calcRoot:
	proto 2 1

	// Push empty bytes after the frame pointer to reserve space for local variables
	byte 0x
	dup

	// examples/merkle/merkle.algo.ts:37
	// i = 0
	int 0
	frame_bury 0 // i: uint64

for_1:
	// examples/merkle/merkle.algo.ts:37
	// i < TREE_DEPTH
	frame_dig 0 // i: uint64
	int 3
	<
	bz for_1_end
	frame_dig 0 // i: uint64
	frame_bury 1 // accessor: accessor//0//elem

	// if0_condition
	// examples/merkle/merkle.algo.ts:40
	// this.isRightSibling(elem)
	frame_dig -2 // path: Path
	frame_dig 1 // saved accessor: accessor//0//elem
	int 33
	* // acc * typeLength
	int 33
	extract3
	callsub isRightSibling
	bz if0_else

	// if0_consequent
	// examples/merkle/merkle.algo.ts:41
	// result = this.hashConcat(result, extract3(elem, 1, 32) as bytes32)
	frame_dig -2 // path: Path
	frame_dig 1 // saved accessor: accessor//0//elem
	int 33
	* // acc * typeLength
	int 33
	extract3
	extract 1 32
	byte 0x0000000000000000000000000000000000000000000000000000000000000000
	concat
	dup
	extract 32 0
	byte 0x
	b==
	assert
	extract 0 32
	frame_dig -1 // leaf: bytes32
	callsub hashConcat
	frame_bury -1 // result: bytes32
	b if0_end

if0_else:
	// examples/merkle/merkle.algo.ts:43
	// result = this.hashConcat(extract3(elem, 1, 32) as bytes32, result)
	frame_dig -1 // leaf: bytes32
	frame_dig -2 // path: Path
	frame_dig 1 // saved accessor: accessor//0//elem
	int 33
	* // acc * typeLength
	int 33
	extract3
	extract 1 32
	byte 0x0000000000000000000000000000000000000000000000000000000000000000
	concat
	dup
	extract 32 0
	byte 0x
	b==
	assert
	extract 0 32
	callsub hashConcat
	frame_bury -1 // result: bytes32

if0_end:
	// examples/merkle/merkle.algo.ts:37
	// i = i + 1
	frame_dig 0 // i: uint64
	int 1
	+
	frame_bury 0 // i: uint64
	b for_1

for_1_end:
	// examples/merkle/merkle.algo.ts:47
	// return result;
	frame_dig -1 // leaf: bytes32

	// set the subroutine return value
	frame_bury 0

	// pop all local variables from the stack
	popn 1
	retsub

abi_route_deleteApplication:
	// execute deleteApplication()void
	callsub deleteApplication
	int 1
	return

// deleteApplication()void
deleteApplication:
	proto 0 0

	// examples/merkle/merkle.algo.ts:51
	// verifyAppCallTxn(this.txn, { sender: this.app.creator })
	// verify sender
	txn Sender
	txna Applications 0
	app_params_get AppCreator
	assert
	==
	assert
	retsub

abi_route_createApplication:
	// execute createApplication()void
	callsub createApplication
	int 1
	return

// createApplication()void
createApplication:
	proto 0 0

	// examples/merkle/merkle.algo.ts:55
	// this.root.value = this.calcInitRoot()
	byte 0x726f6f74 // "root"
	callsub calcInitRoot
	app_global_put
	retsub

abi_route_verify:
	// path: byte[33][3]
	txna ApplicationArgs 2
	dup
	len
	int 99
	==
	assert

	// data: byte[]
	txna ApplicationArgs 1
	extract 2 0

	// execute verify(byte[33][3],byte[])void
	callsub verify
	int 1
	return

// verify(byte[33][3],byte[])void
verify:
	proto 2 0

	// examples/merkle/merkle.algo.ts:59
	// assert(this.root.value === this.calcRoot(sha256(data), path))
	byte 0x726f6f74 // "root"
	app_global_get
	frame_dig -2 // path: Path
	frame_dig -1 // data: bytes
	sha256
	callsub calcRoot
	==
	assert
	retsub

abi_route_appendLeaf:
	// path: byte[33][3]
	txna ApplicationArgs 2
	dup
	len
	int 99
	==
	assert

	// data: byte[]
	txna ApplicationArgs 1
	extract 2 0

	// execute appendLeaf(byte[33][3],byte[])void
	callsub appendLeaf
	int 1
	return

// appendLeaf(byte[33][3],byte[])void
appendLeaf:
	proto 2 0

	// examples/merkle/merkle.algo.ts:63
	// assert(data !== '')
	frame_dig -1 // data: bytes
	byte 0x // ""
	!=
	assert

	// examples/merkle/merkle.algo.ts:64
	// assert(this.root.value === this.calcRoot(EMPTY_HASH, path))
	byte 0x726f6f74 // "root"
	app_global_get
	frame_dig -2 // path: Path

	// examples/merkle/merkle.algo.ts:4
	// hex('e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855')
	byte 0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b8550000000000000000000000000000000000000000000000000000000000000000
	byte 0x
	dup
	b==
	assert
	extract 0 32
	callsub calcRoot
	==
	assert

	// examples/merkle/merkle.algo.ts:66
	// this.root.value = this.calcRoot(sha256(data), path)
	byte 0x726f6f74 // "root"
	frame_dig -2 // path: Path
	frame_dig -1 // data: bytes
	sha256
	callsub calcRoot
	app_global_put

	// examples/merkle/merkle.algo.ts:68
	// this.size.value = this.size.value + 1
	byte 0x73697a65 // "size"
	dup
	app_global_get
	int 1
	+
	app_global_put
	retsub

abi_route_updateLeaf:
	// path: byte[33][3]
	txna ApplicationArgs 3
	dup
	len
	int 99
	==
	assert

	// newData: byte[]
	txna ApplicationArgs 2
	extract 2 0

	// oldData: byte[]
	txna ApplicationArgs 1
	extract 2 0

	// execute updateLeaf(byte[33][3],byte[],byte[])void
	callsub updateLeaf
	int 1
	return

// updateLeaf(byte[33][3],byte[],byte[])void
updateLeaf:
	proto 3 0

	// examples/merkle/merkle.algo.ts:72
	// assert(newData !== '')
	frame_dig -2 // newData: bytes
	byte 0x // ""
	!=
	assert

	// examples/merkle/merkle.algo.ts:73
	// assert(this.root.value === this.calcRoot(sha256(oldData), path))
	byte 0x726f6f74 // "root"
	app_global_get
	frame_dig -3 // path: Path
	frame_dig -1 // oldData: bytes
	sha256
	callsub calcRoot
	==
	assert

	// examples/merkle/merkle.algo.ts:75
	// this.root.value = this.calcRoot(sha256(newData), path)
	byte 0x726f6f74 // "root"
	frame_dig -3 // path: Path
	frame_dig -2 // newData: bytes
	sha256
	callsub calcRoot
	app_global_put
	retsub

create_NoOp:
	method "createApplication()void"
	txna ApplicationArgs 0
	match abi_route_createApplication
	err

call_NoOp:
	method "verify(byte[],byte[33][3])void"
	method "appendLeaf(byte[],byte[33][3])void"
	method "updateLeaf(byte[],byte[],byte[33][3])void"
	txna ApplicationArgs 0
	match abi_route_verify abi_route_appendLeaf abi_route_updateLeaf
	err

call_DeleteApplication:
	method "deleteApplication()void"
	txna ApplicationArgs 0
	match abi_route_deleteApplication
	err",
     "clear": "I3ByYWdtYSB2ZXJzaW9uIDk="
   },
   "contract": {
diff --git a/examples/merkle/artifacts/MerkleTree.src_map.json b/examples/merkle/artifacts/MerkleTree.src_map.json
index f62932316..090a0cf81 100644
--- a/examples/merkle/artifacts/MerkleTree.src_map.json
+++ b/examples/merkle/artifacts/MerkleTree.src_map.json
@@ -646,75 +646,75 @@
     "teal": 139,
     "source": 40,
     "pc": [
-      247,
-      248
+      247
     ]
   },
   {
     "teal": 140,
     "source": 40,
     "pc": [
-      249
+      248
     ]
   },
   {
     "teal": 141,
     "source": 40,
     "pc": [
-      250
+      249
     ]
   },
   {
     "teal": 142,
     "source": 40,
     "pc": [
-      251
+      250,
+      251,
+      252
     ]
   },
   {
     "teal": 143,
     "source": 40,
     "pc": [
-      252,
-      253
+      253,
+      254,
+      255
     ]
   },
   {
-    "teal": 144,
-    "source": 40,
+    "teal": 148,
+    "source": 41,
     "pc": [
-      254
+      256,
+      257
     ]
   },
   {
-    "teal": 145,
-    "source": 40,
+    "teal": 149,
+    "source": 41,
     "pc": [
-      255
+      258,
+      259
     ]
   },
   {
-    "teal": 146,
-    "source": 40,
+    "teal": 150,
+    "source": 41,
     "pc": [
-      256
+      260
     ]
   },
   {
-    "teal": 147,
-    "source": 40,
+    "teal": 151,
+    "source": 41,
     "pc": [
-      257,
-      258,
-      259
+      261
     ]
   },
   {
-    "teal": 148,
-    "source": 40,
+    "teal": 152,
+    "source": 41,
     "pc": [
-      260,
-      261,
       262
     ]
   },
@@ -722,14 +722,14 @@
     "teal": 153,
     "source": 41,
     "pc": [
-      263,
-      264
+      263
     ]
   },
   {
     "teal": 154,
     "source": 41,
     "pc": [
+      264,
       265,
       266
     ]
@@ -745,36 +745,36 @@
     "teal": 156,
     "source": 41,
     "pc": [
-      268,
-      269
+      268
     ]
   },
   {
     "teal": 157,
     "source": 41,
     "pc": [
-      270
+      269
     ]
   },
   {
     "teal": 158,
     "source": 41,
     "pc": [
-      271
+      270,
+      271,
+      272
     ]
   },
   {
     "teal": 159,
     "source": 41,
     "pc": [
-      272
+      273
     ]
   },
   {
     "teal": 160,
     "source": 41,
     "pc": [
-      273,
       274
     ]
   },
@@ -789,88 +789,64 @@
     "teal": 162,
     "source": 41,
     "pc": [
-      276
+      276,
+      277,
+      278
     ]
   },
   {
     "teal": 163,
     "source": 41,
     "pc": [
-      277
-    ]
-  },
-  {
-    "teal": 164,
-    "source": 41,
-    "pc": [
-      278,
       279,
       280
     ]
   },
   {
-    "teal": 165,
-    "source": 41,
-    "pc": [
-      281
-    ]
-  },
-  {
-    "teal": 166,
-    "source": 41,
-    "pc": [
-      282
-    ]
-  },
-  {
-    "teal": 167,
+    "teal": 164,
     "source": 41,
     "pc": [
+      281,
+      282,
       283
     ]
   },
   {
-    "teal": 168,
+    "teal": 165,
     "source": 41,
     "pc": [
       284,
-      285,
-      286
-    ]
-  },
-  {
-    "teal": 169,
-    "source": 41,
-    "pc": [
-      287
+      285
     ]
   },
   {
-    "teal": 170,
-    "source": 41,
+    "teal": 166,
+    "source": 40,
     "pc": [
+      286,
+      287,
       288
     ]
   },
   {
     "teal": 171,
-    "source": 41,
+    "source": 43,
     "pc": [
-      289
+      289,
+      290
     ]
   },
   {
     "teal": 172,
-    "source": 41,
+    "source": 43,
     "pc": [
-      290,
       291,
       292
     ]
   },
   {
     "teal": 173,
-    "source": 41,
+    "source": 43,
     "pc": [
       293,
       294
@@ -878,191 +854,191 @@
   },
   {
     "teal": 174,
-    "source": 41,
+    "source": 43,
     "pc": [
-      295,
-      296,
-      297
+      295
     ]
   },
   {
     "teal": 175,
-    "source": 41,
+    "source": 43,
     "pc": [
-      298,
-      299
+      296
     ]
   },
   {
     "teal": 176,
-    "source": 40,
+    "source": 43,
     "pc": [
-      300,
-      301,
-      302
+      297
     ]
   },
   {
-    "teal": 181,
+    "teal": 177,
     "source": 43,
     "pc": [
-      303,
-      304
+      298
     ]
   },
   {
-    "teal": 182,
+    "teal": 178,
     "source": 43,
     "pc": [
-      305,
-      306
+      299,
+      300,
+      301
     ]
   },
   {
-    "teal": 183,
+    "teal": 179,
     "source": 43,
     "pc": [
-      307,
-      308
+      302
     ]
   },
   {
-    "teal": 184,
+    "teal": 180,
     "source": 43,
     "pc": [
-      309
+      303
     ]
   },
   {
-    "teal": 185,
+    "teal": 181,
     "source": 43,
     "pc": [
-      310,
-      311
+      304
     ]
   },
   {
-    "teal": 186,
+    "teal": 182,
     "source": 43,
     "pc": [
-      312
+      305,
+      306,
+      307
     ]
   },
   {
-    "teal": 187,
+    "teal": 183,
     "source": 43,
     "pc": [
-      313
+      308
     ]
   },
   {
-    "teal": 188,
+    "teal": 184,
     "source": 43,
     "pc": [
-      314
+      309
     ]
   },
   {
-    "teal": 189,
+    "teal": 185,
     "source": 43,
     "pc": [
-      315,
-      316
+      310
     ]
   },
   {
-    "teal": 190,
+    "teal": 186,
     "source": 43,
     "pc": [
-      317
+      311,
+      312,
+      313
     ]
   },
   {
-    "teal": 191,
+    "teal": 187,
     "source": 43,
     "pc": [
-      318
+      314,
+      315,
+      316
     ]
   },
   {
-    "teal": 192,
+    "teal": 188,
     "source": 43,
     "pc": [
-      319
+      317,
+      318
     ]
   },
   {
     "teal": 193,
-    "source": 43,
+    "source": 37,
     "pc": [
-      320,
-      321,
-      322
+      319,
+      320
     ]
   },
   {
     "teal": 194,
-    "source": 43,
+    "source": 37,
     "pc": [
-      323
+      321
     ]
   },
   {
     "teal": 195,
-    "source": 43,
+    "source": 37,
     "pc": [
-      324
+      322
     ]
   },
   {
     "teal": 196,
-    "source": 43,
+    "source": 37,
     "pc": [
-      325
+      323,
+      324
     ]
   },
   {
     "teal": 197,
-    "source": 43,
+    "source": 37,
     "pc": [
+      325,
       326,
-      327,
-      328
+      327
     ]
   },
   {
-    "teal": 198,
-    "source": 43,
+    "teal": 202,
+    "source": 47,
     "pc": [
+      328,
       329
     ]
   },
   {
-    "teal": 199,
-    "source": 43,
+    "teal": 205,
+    "source": 47,
     "pc": [
-      330
+      330,
+      331
     ]
   },
   {
-    "teal": 200,
-    "source": 43,
+    "teal": 208,
+    "source": 47,
     "pc": [
-      331
+      332,
+      333
     ]
   },
   {
-    "teal": 201,
-    "source": 43,
+    "teal": 209,
+    "source": 47,
     "pc": [
-      332,
-      333,
       334
     ]
   },
   {
-    "teal": 202,
-    "source": 43,
+    "teal": 213,
+    "source": 50,
     "pc": [
       335,
       336,
@@ -1070,1097 +1046,1010 @@
     ]
   },
   {
-    "teal": 203,
-    "source": 43,
+    "teal": 214,
+    "source": 50,
     "pc": [
-      338,
-      339
+      338
     ]
   },
   {
-    "teal": 208,
-    "source": 37,
+    "teal": 215,
+    "source": 50,
     "pc": [
-      340,
-      341
+      339
     ]
   },
   {
-    "teal": 209,
-    "source": 37,
+    "teal": 219,
+    "source": 50,
     "pc": [
+      340,
+      341,
       342
     ]
   },
   {
-    "teal": 210,
-    "source": 37,
+    "teal": 224,
+    "source": 51,
     "pc": [
-      343
+      343,
+      344
     ]
   },
   {
-    "teal": 211,
-    "source": 37,
+    "teal": 225,
+    "source": 51,
     "pc": [
-      344,
-      345
+      345,
+      346,
+      347
     ]
   },
   {
-    "teal": 212,
-    "source": 37,
+    "teal": 226,
+    "source": 51,
     "pc": [
-      346,
-      347,
-      348
+      348,
+      349
     ]
   },
   {
-    "teal": 217,
-    "source": 47,
+    "teal": 227,
+    "source": 51,
     "pc": [
-      349,
       350
     ]
   },
   {
-    "teal": 220,
-    "source": 47,
+    "teal": 228,
+    "source": 51,
+    "pc": [
+      351
+    ]
+  },
+  {
+    "teal": 229,
+    "source": 51,
     "pc": [
-      351,
       352
     ]
   },
   {
-    "teal": 223,
-    "source": 47,
+    "teal": 230,
+    "source": 50,
     "pc": [
-      353,
-      354
+      353
     ]
   },
   {
-    "teal": 224,
-    "source": 47,
+    "teal": 234,
+    "source": 54,
     "pc": [
-      355
+      354,
+      355,
+      356
     ]
   },
   {
-    "teal": 228,
-    "source": 50,
+    "teal": 235,
+    "source": 54,
     "pc": [
-      356,
-      357,
-      358
+      357
     ]
   },
   {
-    "teal": 229,
-    "source": 50,
+    "teal": 236,
+    "source": 54,
     "pc": [
-      359
+      358
     ]
   },
   {
-    "teal": 230,
-    "source": 50,
+    "teal": 240,
+    "source": 54,
     "pc": [
-      360
+      359,
+      360,
+      361
     ]
   },
   {
-    "teal": 234,
-    "source": 50,
+    "teal": 244,
+    "source": 55,
     "pc": [
-      361,
-      362,
-      363
+      362
     ]
   },
   {
-    "teal": 239,
-    "source": 51,
+    "teal": 245,
+    "source": 55,
     "pc": [
+      363,
       364,
       365
     ]
   },
   {
-    "teal": 240,
-    "source": 51,
+    "teal": 246,
+    "source": 55,
     "pc": [
-      366,
-      367,
-      368
+      366
     ]
   },
   {
-    "teal": 241,
-    "source": 51,
+    "teal": 247,
+    "source": 54,
+    "pc": [
+      367
+    ]
+  },
+  {
+    "teal": 251,
+    "source": 58,
     "pc": [
+      368,
       369,
       370
     ]
   },
   {
-    "teal": 242,
-    "source": 51,
+    "teal": 252,
+    "source": 58,
     "pc": [
       371
     ]
   },
   {
-    "teal": 243,
-    "source": 51,
+    "teal": 253,
+    "source": 58,
     "pc": [
       372
     ]
   },
   {
-    "teal": 244,
-    "source": 51,
+    "teal": 254,
+    "source": 58,
     "pc": [
       373
     ]
   },
   {
-    "teal": 245,
-    "source": 50,
+    "teal": 255,
+    "source": 58,
     "pc": [
       374
     ]
   },
   {
-    "teal": 249,
-    "source": 54,
+    "teal": 256,
+    "source": 58,
     "pc": [
-      375,
-      376,
-      377
+      375
     ]
   },
   {
-    "teal": 250,
-    "source": 54,
+    "teal": 259,
+    "source": 58,
     "pc": [
+      376,
+      377,
       378
     ]
   },
   {
-    "teal": 251,
-    "source": 54,
+    "teal": 260,
+    "source": 58,
     "pc": [
-      379
+      379,
+      380,
+      381
     ]
   },
   {
-    "teal": 255,
-    "source": 54,
+    "teal": 263,
+    "source": 58,
     "pc": [
-      380,
-      381,
-      382
+      382,
+      383,
+      384
     ]
   },
   {
-    "teal": 259,
-    "source": 55,
+    "teal": 264,
+    "source": 58,
     "pc": [
-      383
+      385
     ]
   },
   {
-    "teal": 260,
-    "source": 55,
+    "teal": 265,
+    "source": 58,
     "pc": [
-      384,
-      385,
       386
     ]
   },
   {
-    "teal": 261,
-    "source": 55,
+    "teal": 269,
+    "source": 58,
     "pc": [
-      387
+      387,
+      388,
+      389
     ]
   },
   {
-    "teal": 262,
-    "source": 54,
+    "teal": 273,
+    "source": 59,
     "pc": [
-      388
+      390
     ]
   },
   {
-    "teal": 266,
-    "source": 58,
+    "teal": 274,
+    "source": 59,
     "pc": [
-      389,
-      390,
       391
     ]
   },
   {
-    "teal": 267,
-    "source": 58,
+    "teal": 275,
+    "source": 59,
     "pc": [
-      392
+      392,
+      393
     ]
   },
   {
-    "teal": 268,
-    "source": 58,
+    "teal": 276,
+    "source": 59,
     "pc": [
-      393
+      394,
+      395
     ]
   },
   {
-    "teal": 269,
-    "source": 58,
-    "pc": [
-      394
-    ]
-  },
-  {
-    "teal": 270,
-    "source": 58,
-    "pc": [
-      395
-    ]
-  },
-  {
-    "teal": 271,
-    "source": 58,
+    "teal": 277,
+    "source": 59,
     "pc": [
       396
     ]
   },
   {
-    "teal": 274,
-    "source": 58,
+    "teal": 278,
+    "source": 59,
     "pc": [
       397,
       398,
       399
     ]
   },
-  {
-    "teal": 275,
-    "source": 58,
-    "pc": [
-      400,
-      401,
-      402
-    ]
-  },
-  {
-    "teal": 278,
-    "source": 58,
-    "pc": [
-      403,
-      404,
-      405
-    ]
-  },
   {
     "teal": 279,
-    "source": 58,
-    "pc": [
-      406
-    ]
-  },
-  {
-    "teal": 280,
-    "source": 58,
-    "pc": [
-      407
-    ]
-  },
-  {
-    "teal": 284,
-    "source": 58,
-    "pc": [
-      408,
-      409,
-      410
-    ]
-  },
-  {
-    "teal": 288,
-    "source": 59,
-    "pc": [
-      411
-    ]
-  },
-  {
-    "teal": 289,
-    "source": 59,
-    "pc": [
-      412
-    ]
-  },
-  {
-    "teal": 290,
-    "source": 59,
-    "pc": [
-      413,
-      414
-    ]
-  },
-  {
-    "teal": 291,
     "source": 59,
     "pc": [
-      415,
-      416
-    ]
-  },
-  {
-    "teal": 292,
-    "source": 59,
-    "pc": [
-      417
+      400
     ]
   },
   {
-    "teal": 293,
-    "source": 59,
-    "pc": [
-      418,
-      419,
-      420
-    ]
-  },
-  {
-    "teal": 294,
-    "source": 59,
-    "pc": [
-      421
-    ]
-  },
-  {
-    "teal": 295,
+    "teal": 280,
     "source": 59,
     "pc": [
-      422
+      401
     ]
   },
   {
-    "teal": 296,
+    "teal": 281,
     "source": 58,
     "pc": [
-      423
+      402
     ]
   },
   {
-    "teal": 300,
+    "teal": 285,
     "source": 62,
     "pc": [
-      424,
-      425,
-      426
+      403,
+      404,
+      405
     ]
   },
   {
-    "teal": 301,
+    "teal": 286,
     "source": 62,
     "pc": [
-      427
+      406
     ]
   },
   {
-    "teal": 302,
+    "teal": 287,
     "source": 62,
     "pc": [
-      428
+      407
     ]
   },
   {
-    "teal": 303,
+    "teal": 288,
     "source": 62,
     "pc": [
-      429
+      408
     ]
   },
   {
-    "teal": 304,
+    "teal": 289,
     "source": 62,
     "pc": [
-      430
+      409
     ]
   },
   {
-    "teal": 305,
+    "teal": 290,
     "source": 62,
     "pc": [
-      431
+      410
     ]
   },
   {
-    "teal": 308,
+    "teal": 293,
     "source": 62,
     "pc": [
-      432,
-      433,
-      434
+      411,
+      412,
+      413
     ]
   },
   {
-    "teal": 309,
+    "teal": 294,
     "source": 62,
     "pc": [
-      435,
-      436,
-      437
+      414,
+      415,
+      416
     ]
   },
   {
-    "teal": 312,
+    "teal": 297,
     "source": 62,
     "pc": [
-      438,
-      439,
-      440
+      417,
+      418,
+      419
     ]
   },
   {
-    "teal": 313,
+    "teal": 298,
     "source": 62,
     "pc": [
-      441
+      420
     ]
   },
   {
-    "teal": 314,
+    "teal": 299,
     "source": 62,
     "pc": [
-      442
+      421
     ]
   },
   {
-    "teal": 318,
+    "teal": 303,
     "source": 62,
     "pc": [
-      443,
-      444,
-      445
+      422,
+      423,
+      424
     ]
   },
   {
-    "teal": 322,
+    "teal": 307,
     "source": 63,
     "pc": [
-      446,
-      447
+      425,
+      426
     ]
   },
   {
-    "teal": 323,
+    "teal": 308,
     "source": 63,
     "pc": [
-      448
+      427
     ]
   },
   {
-    "teal": 324,
+    "teal": 309,
     "source": 63,
     "pc": [
-      449
+      428
     ]
   },
   {
-    "teal": 325,
+    "teal": 310,
     "source": 63,
     "pc": [
-      450
+      429
     ]
   },
   {
-    "teal": 329,
+    "teal": 314,
     "source": 64,
     "pc": [
-      451
+      430
     ]
   },
   {
-    "teal": 330,
+    "teal": 315,
     "source": 64,
     "pc": [
-      452
+      431
     ]
   },
   {
-    "teal": 331,
+    "teal": 316,
     "source": 64,
     "pc": [
-      453,
-      454
+      432,
+      433
     ]
   },
   {
-    "teal": 335,
+    "teal": 320,
     "source": 4,
     "pc": [
-      455
+      434
     ]
   },
   {
-    "teal": 336,
+    "teal": 321,
     "source": 4,
     "pc": [
-      456
+      435
     ]
   },
   {
-    "teal": 337,
+    "teal": 322,
     "source": 4,
     "pc": [
-      457
+      436
     ]
   },
   {
-    "teal": 338,
+    "teal": 323,
     "source": 4,
     "pc": [
-      458
+      437
     ]
   },
   {
-    "teal": 339,
+    "teal": 324,
     "source": 4,
     "pc": [
-      459
+      438
     ]
   },
   {
-    "teal": 340,
+    "teal": 325,
     "source": 4,
     "pc": [
-      460,
-      461,
-      462
+      439,
+      440,
+      441
     ]
   },
   {
-    "teal": 341,
+    "teal": 326,
     "source": 64,
     "pc": [
-      463,
-      464,
-      465
+      442,
+      443,
+      444
     ]
   },
   {
-    "teal": 342,
+    "teal": 327,
     "source": 64,
     "pc": [
-      466
+      445
     ]
   },
   {
-    "teal": 343,
+    "teal": 328,
     "source": 64,
     "pc": [
-      467
+      446
     ]
   },
   {
-    "teal": 347,
+    "teal": 332,
     "source": 66,
     "pc": [
-      468
+      447
     ]
   },
   {
-    "teal": 348,
+    "teal": 333,
     "source": 66,
     "pc": [
-      469,
-      470
+      448,
+      449
     ]
   },
   {
-    "teal": 349,
+    "teal": 334,
     "source": 66,
     "pc": [
-      471,
-      472
+      450,
+      451
     ]
   },
   {
-    "teal": 350,
+    "teal": 335,
     "source": 66,
     "pc": [
-      473
+      452
     ]
   },
   {
-    "teal": 351,
+    "teal": 336,
     "source": 66,
     "pc": [
-      474,
-      475,
-      476
+      453,
+      454,
+      455
     ]
   },
   {
-    "teal": 352,
+    "teal": 337,
     "source": 66,
     "pc": [
-      477
+      456
     ]
   },
   {
-    "teal": 356,
+    "teal": 341,
     "source": 68,
     "pc": [
-      478,
-      479,
-      480,
-      481,
-      482,
-      483
+      457,
+      458,
+      459,
+      460,
+      461,
+      462
     ]
   },
   {
-    "teal": 357,
+    "teal": 342,
     "source": 68,
     "pc": [
-      484
+      463
     ]
   },
   {
-    "teal": 358,
+    "teal": 343,
     "source": 68,
     "pc": [
-      485
+      464
     ]
   },
   {
-    "teal": 359,
+    "teal": 344,
     "source": 68,
     "pc": [
-      486
+      465
     ]
   },
   {
-    "teal": 360,
+    "teal": 345,
     "source": 68,
     "pc": [
-      487
+      466
     ]
   },
   {
-    "teal": 361,
+    "teal": 346,
     "source": 68,
     "pc": [
-      488
+      467
     ]
   },
   {
-    "teal": 362,
+    "teal": 347,
     "source": 62,
     "pc": [
-      489
+      468
     ]
   },
   {
-    "teal": 366,
+    "teal": 351,
     "source": 71,
     "pc": [
-      490,
-      491,
-      492
+      469,
+      470,
+      471
     ]
   },
   {
-    "teal": 367,
+    "teal": 352,
     "source": 71,
     "pc": [
-      493
+      472
     ]
   },
   {
-    "teal": 368,
+    "teal": 353,
     "source": 71,
     "pc": [
-      494
+      473
     ]
   },
   {
-    "teal": 369,
+    "teal": 354,
     "source": 71,
     "pc": [
-      495
+      474
     ]
   },
   {
-    "teal": 370,
+    "teal": 355,
     "source": 71,
     "pc": [
-      496
+      475
     ]
   },
   {
-    "teal": 371,
+    "teal": 356,
     "source": 71,
     "pc": [
-      497
+      476
     ]
   },
   {
-    "teal": 374,
+    "teal": 359,
     "source": 71,
     "pc": [
-      498,
-      499,
-      500
+      477,
+      478,
+      479
     ]
   },
   {
-    "teal": 375,
+    "teal": 360,
     "source": 71,
     "pc": [
-      501,
-      502,
-      503
+      480,
+      481,
+      482
     ]
   },
   {
-    "teal": 378,
+    "teal": 363,
     "source": 71,
     "pc": [
-      504,
-      505,
-      506
+      483,
+      484,
+      485
     ]
   },
   {
-    "teal": 379,
+    "teal": 364,
     "source": 71,
     "pc": [
-      507,
-      508,
-      509
+      486,
+      487,
+      488
     ]
   },
   {
-    "teal": 382,
+    "teal": 367,
     "source": 71,
     "pc": [
-      510,
-      511,
-      512
+      489,
+      490,
+      491
     ]
   },
   {
-    "teal": 383,
+    "teal": 368,
     "source": 71,
     "pc": [
-      513
+      492
     ]
   },
   {
-    "teal": 384,
+    "teal": 369,
     "source": 71,
     "pc": [
-      514
+      493
     ]
   },
   {
-    "teal": 388,
+    "teal": 373,
     "source": 71,
     "pc": [
-      515,
-      516,
-      517
+      494,
+      495,
+      496
     ]
   },
   {
-    "teal": 392,
+    "teal": 377,
     "source": 72,
     "pc": [
-      518,
-      519
+      497,
+      498
     ]
   },
   {
-    "teal": 393,
+    "teal": 378,
     "source": 72,
     "pc": [
-      520
+      499
     ]
   },
   {
-    "teal": 394,
+    "teal": 379,
     "source": 72,
     "pc": [
-      521
+      500
     ]
   },
   {
-    "teal": 395,
+    "teal": 380,
     "source": 72,
     "pc": [
-      522
+      501
     ]
   },
   {
-    "teal": 399,
+    "teal": 384,
     "source": 73,
     "pc": [
-      523
+      502
     ]
   },
   {
-    "teal": 400,
+    "teal": 385,
     "source": 73,
     "pc": [
-      524
+      503
     ]
   },
   {
-    "teal": 401,
+    "teal": 386,
     "source": 73,
     "pc": [
-      525,
-      526
+      504,
+      505
     ]
   },
   {
-    "teal": 402,
+    "teal": 387,
     "source": 73,
     "pc": [
-      527,
-      528
+      506,
+      507
     ]
   },
   {
-    "teal": 403,
+    "teal": 388,
     "source": 73,
     "pc": [
-      529
+      508
     ]
   },
   {
-    "teal": 404,
+    "teal": 389,
     "source": 73,
     "pc": [
-      530,
-      531,
-      532
+      509,
+      510,
+      511
     ]
   },
   {
-    "teal": 405,
+    "teal": 390,
     "source": 73,
     "pc": [
-      533
+      512
     ]
   },
   {
-    "teal": 406,
+    "teal": 391,
     "source": 73,
     "pc": [
-      534
+      513
     ]
   },
   {
-    "teal": 410,
+    "teal": 395,
     "source": 75,
     "pc": [
-      535
+      514
     ]
   },
   {
-    "teal": 411,
+    "teal": 396,
     "source": 75,
     "pc": [
-      536,
-      537
+      515,
+      516
     ]
   },
   {
-    "teal": 412,
+    "teal": 397,
     "source": 75,
     "pc": [
-      538,
-      539
+      517,
+      518
     ]
   },
   {
-    "teal": 413,
+    "teal": 398,
     "source": 75,
     "pc": [
-      540
+      519
     ]
   },
   {
-    "teal": 414,
+    "teal": 399,
     "source": 75,
     "pc": [
-      541,
-      542,
-      543
+      520,
+      521,
+      522
     ]
   },
   {
-    "teal": 415,
+    "teal": 400,
     "source": 75,
     "pc": [
-      544
+      523
     ]
   },
   {
-    "teal": 416,
+    "teal": 401,
     "source": 71,
     "pc": [
-      545
+      524
     ]
   },
   {
-    "teal": 419,
+    "teal": 404,
     "source": 11,
     "pc": [
-      546,
-      547,
-      548,
-      549,
-      550,
-      551
+      525,
+      526,
+      527,
+      528,
+      529,
+      530
     ]
   },
   {
-    "teal": 420,
+    "teal": 405,
     "source": 11,
     "pc": [
-      552,
-      553,
-      554
+      531,
+      532,
+      533
     ]
   },
   {
-    "teal": 421,
+    "teal": 406,
     "source": 11,
     "pc": [
-      555,
-      556,
-      557,
-      558
+      534,
+      535,
+      536,
+      537
     ]
   },
   {
-    "teal": 422,
+    "teal": 407,
     "source": 11,
     "pc": [
-      559
+      538
     ]
   },
   {
-    "teal": 425,
+    "teal": 410,
     "source": 11,
     "pc": [
-      560,
-      561,
-      562,
-      563,
-      564,
-      565
+      539,
+      540,
+      541,
+      542,
+      543,
+      544
     ]
   },
   {
-    "teal": 426,
+    "teal": 411,
     "source": 11,
     "pc": [
-      566,
-      567,
-      568,
-      569,
-      570,
-      571
+      545,
+      546,
+      547,
+      548,
+      549,
+      550
     ]
   },
   {
-    "teal": 427,
+    "teal": 412,
     "source": 11,
     "pc": [
-      572,
-      573,
-      574,
-      575,
-      576,
-      577
+      551,
+      552,
+      553,
+      554,
+      555,
+      556
     ]
   },
   {
-    "teal": 428,
+    "teal": 413,
     "source": 11,
     "pc": [
-      578,
-      579,
-      580
+      557,
+      558,
+      559
     ]
   },
   {
-    "teal": 429,
+    "teal": 414,
     "source": 11,
     "pc": [
-      581,
-      582,
-      583,
-      584,
-      585,
-      586,
-      587,
-      588
+      560,
+      561,
+      562,
+      563,
+      564,
+      565,
+      566,
+      567
     ]
   },
   {
-    "teal": 430,
+    "teal": 415,
     "source": 11,
     "pc": [
-      589
+      568
     ]
   },
   {
-    "teal": 433,
+    "teal": 418,
     "source": 11,
     "pc": [
-      590,
-      591,
-      592,
-      593,
-      594,
-      595
+      569,
+      570,
+      571,
+      572,
+      573,
+      574
     ]
   },
   {
-    "teal": 434,
+    "teal": 419,
     "source": 11,
     "pc": [
-      596,
-      597,
-      598
+      575,
+      576,
+      577
     ]
   },
   {
-    "teal": 435,
+    "teal": 420,
     "source": 11,
     "pc": [
-      599,
-      600,
-      601,
-      602
+      578,
+      579,
+      580,
+      581
     ]
   },
   {
-    "teal": 436,
+    "teal": 421,
     "source": 11,
     "pc": [
-      603
+      582
     ]
   }
 ]
\ No newline at end of file
diff --git a/src/lib/compiler.ts b/src/lib/compiler.ts
index 50ba27a6f..9951bd3c8 100644
--- a/src/lib/compiler.ts
+++ b/src/lib/compiler.ts
@@ -10,6 +10,7 @@ import * as ts from 'ts-morph';
 // eslint-disable-next-line camelcase
 import { sha512_256 } from 'js-sha512';
 import path from 'path';
+import { access } from 'fs';
 import langspec from '../static/langspec.json';
 import { VERSION } from '../version';
 import { optimizeTeal } from './optimize';
@@ -868,13 +869,22 @@ export default class Compiler {
       }
 
       case 'create':
-        this.processNode(args[0]);
-        this.pushVoid(node.getExpression(), 'box_create');
+        if (args[0]) {
+          this.processNode(args[0]);
+        } else if (this.isDynamicType(valueType)) {
+          throw Error('Size must be given to create call when the box value is dynamic');
+        } else this.pushVoid(node, `int ${this.getTypeLength(valueType)}`);
+
+        this.pushLines(node.getExpression(), 'box_create', 'pop');
         break;
 
       case 'extract':
-        this.processNode(args[0]);
-        this.processNode(args[1]);
+        if (args[0] && args[1]) {
+          this.processNode(args[0]);
+          this.processNode(args[1]);
+        } else {
+          this.pushVoid(node.getExpression(), 'cover 2');
+        }
         this.push(node.getExpression(), 'box_extract', StackType.bytes);
         break;
 
@@ -3206,14 +3216,13 @@ export default class Compiler {
 
           this.pushVoid(node, `frame_bury ${frame.index} // ${name}: ${frame.typeString}`);
         } else {
-          // TODO: fix this so box_replace is used when updating a storage ref from frame
-          // const { type, valueType } = this.storageProps[processedFrame.name];
-          // const action = (type === 'box' && !this.isDynamicType(valueType)) ? 'replace' : 'set';
+          const { type, valueType } = this.storageProps[processedFrame.name];
+          const action = type === 'box' && !this.isDynamicType(valueType) ? 'replace' : 'set';
           this.handleStorageAction({
             node: processedFrame.storageExpression!,
             storageAccountFrame: processedFrame.storageAccountFrame,
             storageKeyFrame: processedFrame.storageKeyFrame,
-            action: 'set',
+            action,
             name: processedFrame.name,
           });
         }
@@ -3502,38 +3511,48 @@ export default class Compiler {
   ) {
     const parentType = this.lastType;
 
-    let offset = 0;
     let previousTupleElement = this.getTupleElement(parentType);
+
     accessors.forEach((acc, i) => {
-      let accNumber: number;
+      let accNumber: number | undefined;
+
       if (typeof acc === 'string') {
-        accNumber = Object.keys(getObjectTypes(previousTupleElement.type)).indexOf(acc);
-      } else accNumber = parseInt((acc as ts.Expression).getText(), 10);
+        if (acc.startsWith('accessor//')) {
+          const frame = this.localVariables[acc];
 
-      const elem = previousTupleElement[accNumber] || previousTupleElement[0];
+          this.push(node, `frame_dig ${frame.index} // saved accessor: ${acc}`, StackType.uint64);
+        } else accNumber = Object.keys(getObjectTypes(previousTupleElement.type)).indexOf(acc);
+      } else if (acc.isKind(ts.SyntaxKind.NumericLiteral)) {
+        accNumber = parseInt((acc as ts.Expression).getText(), 10);
+      } else {
+        this.processNode(acc);
+      }
 
-      if (previousTupleElement[accNumber]) offset += elem.headOffset;
-      else offset += accNumber * this.getTypeLength(elem.type);
+      const accessedElem = previousTupleElement[accNumber ?? 0] || previousTupleElement[0];
 
-      previousTupleElement = elem;
+      if (accNumber && previousTupleElement[accNumber]) {
+        this.pushLines(node, `int ${accessedElem.headOffset} // headOffset`);
+      } else {
+        if (accNumber !== undefined) this.pushVoid(node, `int ${accNumber}`);
+        this.pushLines(node, `int ${this.getTypeLength(accessedElem.type)}`, '* // acc * typeLength');
+      }
+
+      if (i) this.pushVoid(node, '+');
+
+      previousTupleElement = accessedElem;
     });
 
     const elem = previousTupleElement;
 
     const length = this.getTypeLength(elem.type);
 
-    // If one of the immediate args is over 255, then replace2/extract won't work
-    const over255 = length > 255 || offset > 255;
-
-    const canBoxReplace =
-      newValue &&
-      parentExpression.isKind(ts.SyntaxKind.PropertyAccessExpression) &&
-      getStorageName(parentExpression) &&
-      this.storageProps[getStorageName(parentExpression)!] &&
-      this.storageProps[getStorageName(parentExpression)!].type === 'box' &&
-      !this.isDynamicType(this.storageProps[getStorageName(parentExpression)!].valueType);
-
-    if (over255 || canBoxReplace) this.pushVoid(node, `int ${offset}`);
+    const storageExpression = this.localVariables[parentExpression.getText()]?.storageExpression ?? parentExpression;
+    const isBox =
+      storageExpression.isKind(ts.SyntaxKind.PropertyAccessExpression) &&
+      getStorageName(storageExpression) &&
+      this.storageProps[getStorageName(storageExpression)!] &&
+      this.storageProps[getStorageName(storageExpression)!].type === 'box' &&
+      !this.isDynamicType(this.storageProps[getStorageName(storageExpression)!].valueType);
 
     if (newValue) {
       if (newValue.isKind(ts.SyntaxKind.NumericLiteral)) {
@@ -3544,15 +3563,20 @@ export default class Compiler {
 
       this.checkEncoding(node, elem.type);
 
-      if (!canBoxReplace) {
-        if (over255) this.pushVoid(node, 'replace3');
-        else this.pushVoid(node, `replace2 ${offset}`);
+      if (!isBox) {
+        this.pushVoid(node, 'replace3');
       }
 
       this.updateValue(parentExpression);
     } else {
-      if (over255) this.pushLines(node, `int ${length}`, 'extract3');
-      else this.pushVoid(node, `extract ${offset} ${length}`);
+      this.pushVoid(node, `int ${length}`);
+      if (isBox) {
+        this.handleStorageAction({
+          node: storageExpression,
+          name: getStorageName(storageExpression)!,
+          action: 'extract',
+        });
+      } else this.pushLines(node, 'extract3');
 
       this.checkDecoding(node, elem.type);
       this.lastType = elem.type;
@@ -3582,7 +3606,7 @@ export default class Compiler {
       if (Number.isNaN(parseInt((a as ts.Expression).getText(), 10))) literalAccessors = false;
     });
 
-    if (isNonBoolStatic && literalAccessors) {
+    if (isNonBoolStatic) {
       this.processLiteralStaticTupleAccess(node, accessors, parentExpression, newValue);
       return;
     }
@@ -4439,7 +4463,8 @@ export default class Compiler {
     const storageName = getStorageName(storageExpression)!;
     const storageProp = this.storageProps[storageName];
     const expr = storageExpression.getExpression();
-    if (!expr.isKind(ts.SyntaxKind.CallExpression)) throw Error();
+
+    if (!expr.isKind(ts.SyntaxKind.CallExpression)) return;
 
     const exprArgs = expr.getArguments();
 
@@ -5214,8 +5239,14 @@ export default class Compiler {
         action = (actionNode.getExpression() as ts.PropertyAccessExpression).getNameNode().getText();
       }
 
-      // Don't get the box value if we can use box_replace later when updating the array
-      if (!(newValue !== undefined && storageProp.type === 'box' && !this.isDynamicType(storageProp.valueType))) {
+      const getFullValue = actionNode.getText() === chain.at(-1)?.getText();
+
+      // Don't get the box value if we can use box_replace or box_extract later
+      if (
+        action! !== 'value' ||
+        getFullValue ||
+        !(storageProp.type === 'box' && !this.isDynamicType(storageProp.valueType))
+      ) {
         this.handleStorageAction({
           node: actionNode,
           name,
@@ -5493,7 +5524,24 @@ export default class Compiler {
 
         // If this is an array reference, get the accessors
         if (frame && frame.index === undefined) {
-          const frameFollow = this.processFrame(chain[0].getExpression(), chain[0].getExpression().getText(), true);
+          const frameFollow = this.processFrame(chain[0].getExpression(), chain[0].getExpression().getText(), false);
+
+          const { storageExpression } = frameFollow;
+
+          // If this is a box with a static array, don't load the value here and use box_extract/replace later
+          const isStaticBox =
+            storageExpression &&
+            storageExpression.isKind(ts.SyntaxKind.PropertyAccessExpression) &&
+            getStorageName(storageExpression) &&
+            this.storageProps[getStorageName(storageExpression)!] &&
+            this.storageProps[getStorageName(storageExpression)!].type === 'box' &&
+            !this.isDynamicType(this.storageProps[getStorageName(storageExpression)!].valueType);
+
+          if (!isStaticBox) {
+            this.processFrame(chain[0].getExpression(), chain[0].getExpression().getText(), true);
+          } else {
+            this.lastType = this.storageProps[getStorageName(storageExpression)!].valueType;
+          }
 
           frameFollow.accessors.forEach((e) => accessors.push(e));
 
diff --git a/src/lib/optimize.ts b/src/lib/optimize.ts
index de774cdf7..e776f1629 100644
--- a/src/lib/optimize.ts
+++ b/src/lib/optimize.ts
@@ -108,7 +108,19 @@ export function optimizeOpcodes(inputTeal: NodeAndTEAL[]): NodeAndTEAL[] {
     const teal = nodeAndTeal.teal.trim();
     const { node } = nodeAndTeal;
 
-    if (teal.startsWith('gloadss')) {
+    if (teal.startsWith('replace3')) {
+      if (outputTeal.at(-1)?.teal.startsWith('byte 0x') && outputTeal.at(-2)?.teal.startsWith('int ')) {
+        const bytes = outputTeal.at(-1)!;
+        const start = parseInt(outputTeal.at(-2)!.teal.split(' ')[1].replace('_', ''), 10);
+
+        popTeal();
+        popTeal();
+        pushTeal(bytes.teal, bytes.node);
+        pushTeal(`replace2 ${start}`, node);
+
+        optimized = true;
+      }
+    } else if (teal.startsWith('gloadss')) {
       if (outputTeal.at(-1)?.teal.startsWith('int ')) {
         const scratchSlot = Number(outputTeal.at(-1)?.teal.split(' ')[1]);
         popTeal();
@@ -175,15 +187,26 @@ export function optimizeOpcodes(inputTeal: NodeAndTEAL[]): NodeAndTEAL[] {
 
         optimized = true;
       }
-    } else if (teal.startsWith('extract ') && outputTeal.at(-1)?.teal.startsWith('byte 0x')) {
-      const bytes = outputTeal.at(-1)!.teal.split(' ')[1].slice(2);
+    } else if (teal.startsWith('extract ')) {
+      const lastLine = outputTeal.at(-1)?.teal;
 
       const start = Number(teal.split(' ')[1]);
       const length = Number(teal.split(' ')[2]);
 
-      popTeal();
-      pushTeal(`byte 0x${bytes.slice(start * 2, start * 2 + length * 2)}`, node);
-      optimized = true;
+      if (lastLine?.startsWith('byte 0x')) {
+        const bytes = outputTeal.at(-1)!.teal.split(' ')[1].slice(2);
+
+        popTeal();
+        pushTeal(`byte 0x${bytes.slice(start * 2, start * 2 + length * 2)}`, node);
+        optimized = true;
+      } else if (lastLine?.startsWith('assert') && outputTeal.at(-2)?.teal.startsWith('box_get')) {
+        popTeal();
+        popTeal();
+        pushTeal(`int ${start}`, node);
+        pushTeal(`int ${length}`, node);
+        pushTeal('box_extract', node);
+        optimized = true;
+      }
     } else if (teal.startsWith('substring ') && outputTeal.at(-1)?.teal.startsWith('byte 0x')) {
       const bytes = outputTeal.at(-1)!.teal.split(' ')[1].slice(2);
 
diff --git a/tests/contracts/artifacts/ABITestArrayRef.approval.teal b/tests/contracts/artifacts/ABITestArrayRef.approval.teal
index f078e5aec..97735200a 100644
--- a/tests/contracts/artifacts/ABITestArrayRef.approval.teal
+++ b/tests/contracts/artifacts/ABITestArrayRef.approval.teal
@@ -55,9 +55,8 @@ arrayRef:
 	frame_dig 0 // a: uint<8>[]
 	store 255 // full array
 	load 255 // full array
-	int 1
 	byte 0x04
-	replace3
+	replace2 1
 	frame_bury 0 // b: uint<8>[]
 
 	// tests/contracts/abi.algo.ts:764
diff --git a/tests/contracts/artifacts/ABITestArrayRef.arc32.json b/tests/contracts/artifacts/ABITestArrayRef.arc32.json
index 2a7b19df7..c16e9eca4 100644
--- a/tests/contracts/artifacts/ABITestArrayRef.arc32.json
+++ b/tests/contracts/artifacts/ABITestArrayRef.arc32.json
@@ -39,7 +39,7 @@
     }
   },
   "source": {
-    "approval": "I3ByYWdtYSB2ZXJzaW9uIDkKCi8vIFRoaXMgVEVBTCB3YXMgZ2VuZXJhdGVkIGJ5IFRFQUxTY3JpcHQgdjAuNzQuMAovLyBodHRwczovL2dpdGh1Yi5jb20vYWxnb3JhbmRmb3VuZGF0aW9uL1RFQUxTY3JpcHQKCi8vIFRoaXMgY29udHJhY3QgaXMgY29tcGxpYW50IHdpdGggYW5kL29yIGltcGxlbWVudHMgdGhlIGZvbGxvd2luZyBBUkNzOiBbIEFSQzQgXQoKLy8gVGhlIGZvbGxvd2luZyB0ZW4gbGluZXMgb2YgVEVBTCBoYW5kbGUgaW5pdGlhbCBwcm9ncmFtIGZsb3cKLy8gVGhpcyBwYXR0ZXJuIGlzIHVzZWQgdG8gbWFrZSBpdCBlYXN5IGZvciBhbnlvbmUgdG8gcGFyc2UgdGhlIHN0YXJ0IG9mIHRoZSBwcm9ncmFtIGFuZCBkZXRlcm1pbmUgaWYgYSBzcGVjaWZpYyBhY3Rpb24gaXMgYWxsb3dlZAovLyBIZXJlLCBhY3Rpb24gcmVmZXJzIHRvIHRoZSBPbkNvbXBsZXRlIGluIGNvbWJpbmF0aW9uIHdpdGggd2hldGhlciB0aGUgYXBwIGlzIGJlaW5nIGNyZWF0ZWQgb3IgY2FsbGVkCi8vIEV2ZXJ5IHBvc3NpYmxlIGFjdGlvbiBmb3IgdGhpcyBjb250cmFjdCBpcyByZXByZXNlbnRlZCBpbiB0aGUgc3dpdGNoIHN0YXRlbWVudAovLyBJZiB0aGUgYWN0aW9uIGlzIG5vdCBpbXBsbWVudGVkIGluIHRoZSBjb250cmFjdCwgaXRzIHJlc3BlY3RpdmUgYnJhbmNoIHdpbGwgYmUgIk5PVF9JTVBMRU1FTlRFRCIgd2hpY2gganVzdCBjb250YWlucyAiZXJyIgp0eG4gQXBwbGljYXRpb25JRAohCmludCA2CioKdHhuIE9uQ29tcGxldGlvbgorCnN3aXRjaCBjYWxsX05vT3AgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBjcmVhdGVfTm9PcCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVECgpOT1RfSU1QTEVNRU5URUQ6CgllcnIKCmFiaV9yb3V0ZV9hcnJheVJlZjoKCS8vIFRoZSBBQkkgcmV0dXJuIHByZWZpeAoJYnl0ZSAweDE1MWY3Yzc1CgoJLy8gZXhlY3V0ZSBhcnJheVJlZigpdWludDhbXQoJY2FsbHN1YiBhcnJheVJlZgoJZHVwCglsZW4KCWl0b2IKCWV4dHJhY3QgNiAyCglzd2FwCgljb25jYXQKCWNvbmNhdAoJbG9nCglpbnQgMQoJcmV0dXJuCgovLyBhcnJheVJlZigpdWludDhbXQphcnJheVJlZjoKCXByb3RvIDAgMQoKCS8vIFB1c2ggZW1wdHkgYnl0ZXMgYWZ0ZXIgdGhlIGZyYW1lIHBvaW50ZXIgdG8gcmVzZXJ2ZSBzcGFjZSBmb3IgbG9jYWwgdmFyaWFibGVzCglieXRlIDB4CgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjc1OQoJLy8gYTogdWludDw4PltdID0gWzEsIDIsIDNdCglieXRlIDB4MDEwMjAzCglmcmFtZV9idXJ5IDAgLy8gYTogdWludDw4PltdCgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjc2MgoJLy8gYlsxXSA9IDQgYXMgdWludDw4PgoJZnJhbWVfZGlnIDAgLy8gYTogdWludDw4PltdCglzdG9yZSAyNTUgLy8gZnVsbCBhcnJheQoJbG9hZCAyNTUgLy8gZnVsbCBhcnJheQoJaW50IDEKCWJ5dGUgMHgwNAoJcmVwbGFjZTMKCWZyYW1lX2J1cnkgMCAvLyBiOiB1aW50PDg+W10KCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6NzY0CgkvLyByZXR1cm4gYTsKCWZyYW1lX2RpZyAwIC8vIGE6IHVpbnQ8OD5bXQoKCS8vIHNldCB0aGUgc3Vicm91dGluZSByZXR1cm4gdmFsdWUKCWZyYW1lX2J1cnkgMAoJcmV0c3ViCgphYmlfcm91dGVfY3JlYXRlQXBwbGljYXRpb246CglpbnQgMQoJcmV0dXJuCgpjcmVhdGVfTm9PcDoKCW1ldGhvZCAiY3JlYXRlQXBwbGljYXRpb24oKXZvaWQiCgl0eG5hIEFwcGxpY2F0aW9uQXJncyAwCgltYXRjaCBhYmlfcm91dGVfY3JlYXRlQXBwbGljYXRpb24KCWVycgoKY2FsbF9Ob09wOgoJbWV0aG9kICJhcnJheVJlZigpdWludDhbXSIKCXR4bmEgQXBwbGljYXRpb25BcmdzIDAKCW1hdGNoIGFiaV9yb3V0ZV9hcnJheVJlZgoJZXJy",
+    "approval": "I3ByYWdtYSB2ZXJzaW9uIDkKCi8vIFRoaXMgVEVBTCB3YXMgZ2VuZXJhdGVkIGJ5IFRFQUxTY3JpcHQgdjAuNzQuMAovLyBodHRwczovL2dpdGh1Yi5jb20vYWxnb3JhbmRmb3VuZGF0aW9uL1RFQUxTY3JpcHQKCi8vIFRoaXMgY29udHJhY3QgaXMgY29tcGxpYW50IHdpdGggYW5kL29yIGltcGxlbWVudHMgdGhlIGZvbGxvd2luZyBBUkNzOiBbIEFSQzQgXQoKLy8gVGhlIGZvbGxvd2luZyB0ZW4gbGluZXMgb2YgVEVBTCBoYW5kbGUgaW5pdGlhbCBwcm9ncmFtIGZsb3cKLy8gVGhpcyBwYXR0ZXJuIGlzIHVzZWQgdG8gbWFrZSBpdCBlYXN5IGZvciBhbnlvbmUgdG8gcGFyc2UgdGhlIHN0YXJ0IG9mIHRoZSBwcm9ncmFtIGFuZCBkZXRlcm1pbmUgaWYgYSBzcGVjaWZpYyBhY3Rpb24gaXMgYWxsb3dlZAovLyBIZXJlLCBhY3Rpb24gcmVmZXJzIHRvIHRoZSBPbkNvbXBsZXRlIGluIGNvbWJpbmF0aW9uIHdpdGggd2hldGhlciB0aGUgYXBwIGlzIGJlaW5nIGNyZWF0ZWQgb3IgY2FsbGVkCi8vIEV2ZXJ5IHBvc3NpYmxlIGFjdGlvbiBmb3IgdGhpcyBjb250cmFjdCBpcyByZXByZXNlbnRlZCBpbiB0aGUgc3dpdGNoIHN0YXRlbWVudAovLyBJZiB0aGUgYWN0aW9uIGlzIG5vdCBpbXBsbWVudGVkIGluIHRoZSBjb250cmFjdCwgaXRzIHJlc3BlY3RpdmUgYnJhbmNoIHdpbGwgYmUgIk5PVF9JTVBMRU1FTlRFRCIgd2hpY2gganVzdCBjb250YWlucyAiZXJyIgp0eG4gQXBwbGljYXRpb25JRAohCmludCA2CioKdHhuIE9uQ29tcGxldGlvbgorCnN3aXRjaCBjYWxsX05vT3AgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBjcmVhdGVfTm9PcCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVECgpOT1RfSU1QTEVNRU5URUQ6CgllcnIKCmFiaV9yb3V0ZV9hcnJheVJlZjoKCS8vIFRoZSBBQkkgcmV0dXJuIHByZWZpeAoJYnl0ZSAweDE1MWY3Yzc1CgoJLy8gZXhlY3V0ZSBhcnJheVJlZigpdWludDhbXQoJY2FsbHN1YiBhcnJheVJlZgoJZHVwCglsZW4KCWl0b2IKCWV4dHJhY3QgNiAyCglzd2FwCgljb25jYXQKCWNvbmNhdAoJbG9nCglpbnQgMQoJcmV0dXJuCgovLyBhcnJheVJlZigpdWludDhbXQphcnJheVJlZjoKCXByb3RvIDAgMQoKCS8vIFB1c2ggZW1wdHkgYnl0ZXMgYWZ0ZXIgdGhlIGZyYW1lIHBvaW50ZXIgdG8gcmVzZXJ2ZSBzcGFjZSBmb3IgbG9jYWwgdmFyaWFibGVzCglieXRlIDB4CgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjc1OQoJLy8gYTogdWludDw4PltdID0gWzEsIDIsIDNdCglieXRlIDB4MDEwMjAzCglmcmFtZV9idXJ5IDAgLy8gYTogdWludDw4PltdCgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjc2MgoJLy8gYlsxXSA9IDQgYXMgdWludDw4PgoJZnJhbWVfZGlnIDAgLy8gYTogdWludDw4PltdCglzdG9yZSAyNTUgLy8gZnVsbCBhcnJheQoJbG9hZCAyNTUgLy8gZnVsbCBhcnJheQoJYnl0ZSAweDA0CglyZXBsYWNlMiAxCglmcmFtZV9idXJ5IDAgLy8gYjogdWludDw4PltdCgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjc2NAoJLy8gcmV0dXJuIGE7CglmcmFtZV9kaWcgMCAvLyBhOiB1aW50PDg+W10KCgkvLyBzZXQgdGhlIHN1YnJvdXRpbmUgcmV0dXJuIHZhbHVlCglmcmFtZV9idXJ5IDAKCXJldHN1YgoKYWJpX3JvdXRlX2NyZWF0ZUFwcGxpY2F0aW9uOgoJaW50IDEKCXJldHVybgoKY3JlYXRlX05vT3A6CgltZXRob2QgImNyZWF0ZUFwcGxpY2F0aW9uKCl2b2lkIgoJdHhuYSBBcHBsaWNhdGlvbkFyZ3MgMAoJbWF0Y2ggYWJpX3JvdXRlX2NyZWF0ZUFwcGxpY2F0aW9uCgllcnIKCmNhbGxfTm9PcDoKCW1ldGhvZCAiYXJyYXlSZWYoKXVpbnQ4W10iCgl0eG5hIEFwcGxpY2F0aW9uQXJncyAwCgltYXRjaCBhYmlfcm91dGVfYXJyYXlSZWYKCWVycg==",
     "clear": "I3ByYWdtYSB2ZXJzaW9uIDk="
   },
   "contract": {
diff --git a/tests/contracts/artifacts/ABITestNonLiteralNestedArrayRef.approval.teal b/tests/contracts/artifacts/ABITestNonLiteralNestedArrayRef.approval.teal
index 89883bc0a..ce76002b2 100644
--- a/tests/contracts/artifacts/ABITestNonLiteralNestedArrayRef.approval.teal
+++ b/tests/contracts/artifacts/ABITestNonLiteralNestedArrayRef.approval.teal
@@ -63,16 +63,11 @@ nonLiteralNestedArrayRef:
 	// tests/contracts/abi.algo.ts:794
 	// b[1] = 5 as uint<8>
 	frame_dig 0 // a: StaticArray<StaticArray<uint<8>, 2>, 2>
-	store 255 // full array
-	int 0 // initial offset
 	frame_dig 2 // saved accessor: accessor//0//b
 	int 2
 	* // acc * typeLength
+	int 1
 	+
-	int 1 // acc * typeLength
-	+
-	load 255 // full array
-	swap
 	byte 0x05
 	replace3
 	frame_bury 0 // b: StaticArray<StaticArray<uint<8>, 2>, 2>
diff --git a/tests/contracts/artifacts/ABITestNonLiteralNestedArrayRef.arc32.json b/tests/contracts/artifacts/ABITestNonLiteralNestedArrayRef.arc32.json
index e777faf86..4d5906f56 100644
--- a/tests/contracts/artifacts/ABITestNonLiteralNestedArrayRef.arc32.json
+++ b/tests/contracts/artifacts/ABITestNonLiteralNestedArrayRef.arc32.json
@@ -39,7 +39,7 @@
     }
   },
   "source": {
-    "approval": "I3ByYWdtYSB2ZXJzaW9uIDkKCi8vIFRoaXMgVEVBTCB3YXMgZ2VuZXJhdGVkIGJ5IFRFQUxTY3JpcHQgdjAuNzQuMAovLyBodHRwczovL2dpdGh1Yi5jb20vYWxnb3JhbmRmb3VuZGF0aW9uL1RFQUxTY3JpcHQKCi8vIFRoaXMgY29udHJhY3QgaXMgY29tcGxpYW50IHdpdGggYW5kL29yIGltcGxlbWVudHMgdGhlIGZvbGxvd2luZyBBUkNzOiBbIEFSQzQgXQoKLy8gVGhlIGZvbGxvd2luZyB0ZW4gbGluZXMgb2YgVEVBTCBoYW5kbGUgaW5pdGlhbCBwcm9ncmFtIGZsb3cKLy8gVGhpcyBwYXR0ZXJuIGlzIHVzZWQgdG8gbWFrZSBpdCBlYXN5IGZvciBhbnlvbmUgdG8gcGFyc2UgdGhlIHN0YXJ0IG9mIHRoZSBwcm9ncmFtIGFuZCBkZXRlcm1pbmUgaWYgYSBzcGVjaWZpYyBhY3Rpb24gaXMgYWxsb3dlZAovLyBIZXJlLCBhY3Rpb24gcmVmZXJzIHRvIHRoZSBPbkNvbXBsZXRlIGluIGNvbWJpbmF0aW9uIHdpdGggd2hldGhlciB0aGUgYXBwIGlzIGJlaW5nIGNyZWF0ZWQgb3IgY2FsbGVkCi8vIEV2ZXJ5IHBvc3NpYmxlIGFjdGlvbiBmb3IgdGhpcyBjb250cmFjdCBpcyByZXByZXNlbnRlZCBpbiB0aGUgc3dpdGNoIHN0YXRlbWVudAovLyBJZiB0aGUgYWN0aW9uIGlzIG5vdCBpbXBsbWVudGVkIGluIHRoZSBjb250cmFjdCwgaXRzIHJlc3BlY3RpdmUgYnJhbmNoIHdpbGwgYmUgIk5PVF9JTVBMRU1FTlRFRCIgd2hpY2gganVzdCBjb250YWlucyAiZXJyIgp0eG4gQXBwbGljYXRpb25JRAohCmludCA2CioKdHhuIE9uQ29tcGxldGlvbgorCnN3aXRjaCBjYWxsX05vT3AgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBjcmVhdGVfTm9PcCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVECgpOT1RfSU1QTEVNRU5URUQ6CgllcnIKCmFiaV9yb3V0ZV9ub25MaXRlcmFsTmVzdGVkQXJyYXlSZWY6CgkvLyBUaGUgQUJJIHJldHVybiBwcmVmaXgKCWJ5dGUgMHgxNTFmN2M3NQoKCS8vIGV4ZWN1dGUgbm9uTGl0ZXJhbE5lc3RlZEFycmF5UmVmKCl1aW50OFsyXVsyXQoJY2FsbHN1YiBub25MaXRlcmFsTmVzdGVkQXJyYXlSZWYKCWNvbmNhdAoJbG9nCglpbnQgMQoJcmV0dXJuCgovLyBub25MaXRlcmFsTmVzdGVkQXJyYXlSZWYoKXVpbnQ4WzJdWzJdCm5vbkxpdGVyYWxOZXN0ZWRBcnJheVJlZjoKCXByb3RvIDAgMQoKCS8vIFB1c2ggZW1wdHkgYnl0ZXMgYWZ0ZXIgdGhlIGZyYW1lIHBvaW50ZXIgdG8gcmVzZXJ2ZSBzcGFjZSBmb3IgbG9jYWwgdmFyaWFibGVzCglieXRlIDB4CglkdXBuIDMKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6Nzg0CgkvLyBhOiBTdGF0aWNBcnJheTxTdGF0aWNBcnJheTx1aW50PDg+LCAyPiwgMj4gPSBbCgkvLyAgICAgICBbMSwgMl0sCgkvLyAgICAgICBbMywgNF0sCgkvLyAgICAgXQoJYnl0ZSAweDAxMDIwMzA0CglmcmFtZV9idXJ5IDAgLy8gYTogU3RhdGljQXJyYXk8U3RhdGljQXJyYXk8dWludDw4PiwgMj4sIDI+CgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjc4OQoJLy8gaSA9IDEKCWludCAxCglmcmFtZV9idXJ5IDEgLy8gaTogdWludDY0CglmcmFtZV9kaWcgMSAvLyBpOiB1aW50NjQKCWZyYW1lX2J1cnkgMiAvLyBhY2Nlc3NvcjogYWNjZXNzb3IvLzAvL2IKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6NzkyCgkvLyBpID0gMTMzNwoJaW50IDEzMzcKCWZyYW1lX2J1cnkgMSAvLyBpOiB1aW50NjQKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6Nzk0CgkvLyBiWzFdID0gNSBhcyB1aW50PDg+CglmcmFtZV9kaWcgMCAvLyBhOiBTdGF0aWNBcnJheTxTdGF0aWNBcnJheTx1aW50PDg+LCAyPiwgMj4KCXN0b3JlIDI1NSAvLyBmdWxsIGFycmF5CglpbnQgMCAvLyBpbml0aWFsIG9mZnNldAoJZnJhbWVfZGlnIDIgLy8gc2F2ZWQgYWNjZXNzb3I6IGFjY2Vzc29yLy8wLy9iCglpbnQgMgoJKiAvLyBhY2MgKiB0eXBlTGVuZ3RoCgkrCglpbnQgMSAvLyBhY2MgKiB0eXBlTGVuZ3RoCgkrCglsb2FkIDI1NSAvLyBmdWxsIGFycmF5Cglzd2FwCglieXRlIDB4MDUKCXJlcGxhY2UzCglmcmFtZV9idXJ5IDAgLy8gYjogU3RhdGljQXJyYXk8U3RhdGljQXJyYXk8dWludDw4PiwgMj4sIDI+CgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjc5NgoJLy8gcmV0dXJuIGE7CglmcmFtZV9kaWcgMCAvLyBhOiBTdGF0aWNBcnJheTxTdGF0aWNBcnJheTx1aW50PDg+LCAyPiwgMj4KCgkvLyBzZXQgdGhlIHN1YnJvdXRpbmUgcmV0dXJuIHZhbHVlCglmcmFtZV9idXJ5IDAKCgkvLyBwb3AgYWxsIGxvY2FsIHZhcmlhYmxlcyBmcm9tIHRoZSBzdGFjawoJcG9wbiAyCglyZXRzdWIKCmFiaV9yb3V0ZV9jcmVhdGVBcHBsaWNhdGlvbjoKCWludCAxCglyZXR1cm4KCmNyZWF0ZV9Ob09wOgoJbWV0aG9kICJjcmVhdGVBcHBsaWNhdGlvbigpdm9pZCIKCXR4bmEgQXBwbGljYXRpb25BcmdzIDAKCW1hdGNoIGFiaV9yb3V0ZV9jcmVhdGVBcHBsaWNhdGlvbgoJZXJyCgpjYWxsX05vT3A6CgltZXRob2QgIm5vbkxpdGVyYWxOZXN0ZWRBcnJheVJlZigpdWludDhbMl1bMl0iCgl0eG5hIEFwcGxpY2F0aW9uQXJncyAwCgltYXRjaCBhYmlfcm91dGVfbm9uTGl0ZXJhbE5lc3RlZEFycmF5UmVmCgllcnI=",
+    "approval": "I3ByYWdtYSB2ZXJzaW9uIDkKCi8vIFRoaXMgVEVBTCB3YXMgZ2VuZXJhdGVkIGJ5IFRFQUxTY3JpcHQgdjAuNzQuMAovLyBodHRwczovL2dpdGh1Yi5jb20vYWxnb3JhbmRmb3VuZGF0aW9uL1RFQUxTY3JpcHQKCi8vIFRoaXMgY29udHJhY3QgaXMgY29tcGxpYW50IHdpdGggYW5kL29yIGltcGxlbWVudHMgdGhlIGZvbGxvd2luZyBBUkNzOiBbIEFSQzQgXQoKLy8gVGhlIGZvbGxvd2luZyB0ZW4gbGluZXMgb2YgVEVBTCBoYW5kbGUgaW5pdGlhbCBwcm9ncmFtIGZsb3cKLy8gVGhpcyBwYXR0ZXJuIGlzIHVzZWQgdG8gbWFrZSBpdCBlYXN5IGZvciBhbnlvbmUgdG8gcGFyc2UgdGhlIHN0YXJ0IG9mIHRoZSBwcm9ncmFtIGFuZCBkZXRlcm1pbmUgaWYgYSBzcGVjaWZpYyBhY3Rpb24gaXMgYWxsb3dlZAovLyBIZXJlLCBhY3Rpb24gcmVmZXJzIHRvIHRoZSBPbkNvbXBsZXRlIGluIGNvbWJpbmF0aW9uIHdpdGggd2hldGhlciB0aGUgYXBwIGlzIGJlaW5nIGNyZWF0ZWQgb3IgY2FsbGVkCi8vIEV2ZXJ5IHBvc3NpYmxlIGFjdGlvbiBmb3IgdGhpcyBjb250cmFjdCBpcyByZXByZXNlbnRlZCBpbiB0aGUgc3dpdGNoIHN0YXRlbWVudAovLyBJZiB0aGUgYWN0aW9uIGlzIG5vdCBpbXBsbWVudGVkIGluIHRoZSBjb250cmFjdCwgaXRzIHJlc3BlY3RpdmUgYnJhbmNoIHdpbGwgYmUgIk5PVF9JTVBMRU1FTlRFRCIgd2hpY2gganVzdCBjb250YWlucyAiZXJyIgp0eG4gQXBwbGljYXRpb25JRAohCmludCA2CioKdHhuIE9uQ29tcGxldGlvbgorCnN3aXRjaCBjYWxsX05vT3AgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBjcmVhdGVfTm9PcCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVECgpOT1RfSU1QTEVNRU5URUQ6CgllcnIKCmFiaV9yb3V0ZV9ub25MaXRlcmFsTmVzdGVkQXJyYXlSZWY6CgkvLyBUaGUgQUJJIHJldHVybiBwcmVmaXgKCWJ5dGUgMHgxNTFmN2M3NQoKCS8vIGV4ZWN1dGUgbm9uTGl0ZXJhbE5lc3RlZEFycmF5UmVmKCl1aW50OFsyXVsyXQoJY2FsbHN1YiBub25MaXRlcmFsTmVzdGVkQXJyYXlSZWYKCWNvbmNhdAoJbG9nCglpbnQgMQoJcmV0dXJuCgovLyBub25MaXRlcmFsTmVzdGVkQXJyYXlSZWYoKXVpbnQ4WzJdWzJdCm5vbkxpdGVyYWxOZXN0ZWRBcnJheVJlZjoKCXByb3RvIDAgMQoKCS8vIFB1c2ggZW1wdHkgYnl0ZXMgYWZ0ZXIgdGhlIGZyYW1lIHBvaW50ZXIgdG8gcmVzZXJ2ZSBzcGFjZSBmb3IgbG9jYWwgdmFyaWFibGVzCglieXRlIDB4CglkdXBuIDMKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6Nzg0CgkvLyBhOiBTdGF0aWNBcnJheTxTdGF0aWNBcnJheTx1aW50PDg+LCAyPiwgMj4gPSBbCgkvLyAgICAgICBbMSwgMl0sCgkvLyAgICAgICBbMywgNF0sCgkvLyAgICAgXQoJYnl0ZSAweDAxMDIwMzA0CglmcmFtZV9idXJ5IDAgLy8gYTogU3RhdGljQXJyYXk8U3RhdGljQXJyYXk8dWludDw4PiwgMj4sIDI+CgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjc4OQoJLy8gaSA9IDEKCWludCAxCglmcmFtZV9idXJ5IDEgLy8gaTogdWludDY0CglmcmFtZV9kaWcgMSAvLyBpOiB1aW50NjQKCWZyYW1lX2J1cnkgMiAvLyBhY2Nlc3NvcjogYWNjZXNzb3IvLzAvL2IKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6NzkyCgkvLyBpID0gMTMzNwoJaW50IDEzMzcKCWZyYW1lX2J1cnkgMSAvLyBpOiB1aW50NjQKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6Nzk0CgkvLyBiWzFdID0gNSBhcyB1aW50PDg+CglmcmFtZV9kaWcgMCAvLyBhOiBTdGF0aWNBcnJheTxTdGF0aWNBcnJheTx1aW50PDg+LCAyPiwgMj4KCWZyYW1lX2RpZyAyIC8vIHNhdmVkIGFjY2Vzc29yOiBhY2Nlc3Nvci8vMC8vYgoJaW50IDIKCSogLy8gYWNjICogdHlwZUxlbmd0aAoJaW50IDEKCSsKCWJ5dGUgMHgwNQoJcmVwbGFjZTMKCWZyYW1lX2J1cnkgMCAvLyBiOiBTdGF0aWNBcnJheTxTdGF0aWNBcnJheTx1aW50PDg+LCAyPiwgMj4KCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6Nzk2CgkvLyByZXR1cm4gYTsKCWZyYW1lX2RpZyAwIC8vIGE6IFN0YXRpY0FycmF5PFN0YXRpY0FycmF5PHVpbnQ8OD4sIDI+LCAyPgoKCS8vIHNldCB0aGUgc3Vicm91dGluZSByZXR1cm4gdmFsdWUKCWZyYW1lX2J1cnkgMAoKCS8vIHBvcCBhbGwgbG9jYWwgdmFyaWFibGVzIGZyb20gdGhlIHN0YWNrCglwb3BuIDIKCXJldHN1YgoKYWJpX3JvdXRlX2NyZWF0ZUFwcGxpY2F0aW9uOgoJaW50IDEKCXJldHVybgoKY3JlYXRlX05vT3A6CgltZXRob2QgImNyZWF0ZUFwcGxpY2F0aW9uKCl2b2lkIgoJdHhuYSBBcHBsaWNhdGlvbkFyZ3MgMAoJbWF0Y2ggYWJpX3JvdXRlX2NyZWF0ZUFwcGxpY2F0aW9uCgllcnIKCmNhbGxfTm9PcDoKCW1ldGhvZCAibm9uTGl0ZXJhbE5lc3RlZEFycmF5UmVmKCl1aW50OFsyXVsyXSIKCXR4bmEgQXBwbGljYXRpb25BcmdzIDAKCW1hdGNoIGFiaV9yb3V0ZV9ub25MaXRlcmFsTmVzdGVkQXJyYXlSZWYKCWVycg==",
     "clear": "I3ByYWdtYSB2ZXJzaW9uIDk="
   },
   "contract": {
diff --git a/tests/contracts/artifacts/ABITestNonLiteralStaticArrayAccess.approval.teal b/tests/contracts/artifacts/ABITestNonLiteralStaticArrayAccess.approval.teal
index 7c823ed02..6c75d1183 100644
--- a/tests/contracts/artifacts/ABITestNonLiteralStaticArrayAccess.approval.teal
+++ b/tests/contracts/artifacts/ABITestNonLiteralStaticArrayAccess.approval.teal
@@ -54,8 +54,6 @@ nonLiteralStaticArrayAccess:
 	// tests/contracts/abi.algo.ts:58
 	// return a[n];
 	frame_dig 0 // a: StaticArray<uint64, 3>
-	store 255 // full array
-	load 255 // full array
 	extract 16 8
 	btoi
 
diff --git a/tests/contracts/artifacts/ABITestNonLiteralStaticArrayAccess.arc32.json b/tests/contracts/artifacts/ABITestNonLiteralStaticArrayAccess.arc32.json
index b7f2348a7..155525dfc 100644
--- a/tests/contracts/artifacts/ABITestNonLiteralStaticArrayAccess.arc32.json
+++ b/tests/contracts/artifacts/ABITestNonLiteralStaticArrayAccess.arc32.json
@@ -39,7 +39,7 @@
     }
   },
   "source": {
-    "approval": "I3ByYWdtYSB2ZXJzaW9uIDkKCi8vIFRoaXMgVEVBTCB3YXMgZ2VuZXJhdGVkIGJ5IFRFQUxTY3JpcHQgdjAuNzQuMAovLyBodHRwczovL2dpdGh1Yi5jb20vYWxnb3JhbmRmb3VuZGF0aW9uL1RFQUxTY3JpcHQKCi8vIFRoaXMgY29udHJhY3QgaXMgY29tcGxpYW50IHdpdGggYW5kL29yIGltcGxlbWVudHMgdGhlIGZvbGxvd2luZyBBUkNzOiBbIEFSQzQgXQoKLy8gVGhlIGZvbGxvd2luZyB0ZW4gbGluZXMgb2YgVEVBTCBoYW5kbGUgaW5pdGlhbCBwcm9ncmFtIGZsb3cKLy8gVGhpcyBwYXR0ZXJuIGlzIHVzZWQgdG8gbWFrZSBpdCBlYXN5IGZvciBhbnlvbmUgdG8gcGFyc2UgdGhlIHN0YXJ0IG9mIHRoZSBwcm9ncmFtIGFuZCBkZXRlcm1pbmUgaWYgYSBzcGVjaWZpYyBhY3Rpb24gaXMgYWxsb3dlZAovLyBIZXJlLCBhY3Rpb24gcmVmZXJzIHRvIHRoZSBPbkNvbXBsZXRlIGluIGNvbWJpbmF0aW9uIHdpdGggd2hldGhlciB0aGUgYXBwIGlzIGJlaW5nIGNyZWF0ZWQgb3IgY2FsbGVkCi8vIEV2ZXJ5IHBvc3NpYmxlIGFjdGlvbiBmb3IgdGhpcyBjb250cmFjdCBpcyByZXByZXNlbnRlZCBpbiB0aGUgc3dpdGNoIHN0YXRlbWVudAovLyBJZiB0aGUgYWN0aW9uIGlzIG5vdCBpbXBsbWVudGVkIGluIHRoZSBjb250cmFjdCwgaXRzIHJlc3BlY3RpdmUgYnJhbmNoIHdpbGwgYmUgIk5PVF9JTVBMRU1FTlRFRCIgd2hpY2gganVzdCBjb250YWlucyAiZXJyIgp0eG4gQXBwbGljYXRpb25JRAohCmludCA2CioKdHhuIE9uQ29tcGxldGlvbgorCnN3aXRjaCBjYWxsX05vT3AgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBjcmVhdGVfTm9PcCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVECgpOT1RfSU1QTEVNRU5URUQ6CgllcnIKCmFiaV9yb3V0ZV9ub25MaXRlcmFsU3RhdGljQXJyYXlBY2Nlc3M6CgkvLyBUaGUgQUJJIHJldHVybiBwcmVmaXgKCWJ5dGUgMHgxNTFmN2M3NQoKCS8vIGV4ZWN1dGUgbm9uTGl0ZXJhbFN0YXRpY0FycmF5QWNjZXNzKCl1aW50NjQKCWNhbGxzdWIgbm9uTGl0ZXJhbFN0YXRpY0FycmF5QWNjZXNzCglpdG9iCgljb25jYXQKCWxvZwoJaW50IDEKCXJldHVybgoKLy8gbm9uTGl0ZXJhbFN0YXRpY0FycmF5QWNjZXNzKCl1aW50NjQKbm9uTGl0ZXJhbFN0YXRpY0FycmF5QWNjZXNzOgoJcHJvdG8gMCAxCgoJLy8gUHVzaCBlbXB0eSBieXRlcyBhZnRlciB0aGUgZnJhbWUgcG9pbnRlciB0byByZXNlcnZlIHNwYWNlIGZvciBsb2NhbCB2YXJpYWJsZXMKCWJ5dGUgMHgKCWR1cAoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czo1NQoJLy8gYTogU3RhdGljQXJyYXk8dWludDY0LCAzPiA9IFsxMSwgMjIsIDMzXQoJYnl0ZSAweDAwMDAwMDAwMDAwMDAwMGIwMDAwMDAwMDAwMDAwMDE2MDAwMDAwMDAwMDAwMDAyMQoJZnJhbWVfYnVyeSAwIC8vIGE6IFN0YXRpY0FycmF5PHVpbnQ2NCwgMz4KCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6NTYKCS8vIG4gPSAyCglpbnQgMgoJZnJhbWVfYnVyeSAxIC8vIG46IHVpbnQ2NAoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czo1OAoJLy8gcmV0dXJuIGFbbl07CglmcmFtZV9kaWcgMCAvLyBhOiBTdGF0aWNBcnJheTx1aW50NjQsIDM+CglzdG9yZSAyNTUgLy8gZnVsbCBhcnJheQoJbG9hZCAyNTUgLy8gZnVsbCBhcnJheQoJZXh0cmFjdCAxNiA4CglidG9pCgoJLy8gc2V0IHRoZSBzdWJyb3V0aW5lIHJldHVybiB2YWx1ZQoJZnJhbWVfYnVyeSAwCgoJLy8gcG9wIGFsbCBsb2NhbCB2YXJpYWJsZXMgZnJvbSB0aGUgc3RhY2sKCXBvcG4gMQoJcmV0c3ViCgphYmlfcm91dGVfY3JlYXRlQXBwbGljYXRpb246CglpbnQgMQoJcmV0dXJuCgpjcmVhdGVfTm9PcDoKCW1ldGhvZCAiY3JlYXRlQXBwbGljYXRpb24oKXZvaWQiCgl0eG5hIEFwcGxpY2F0aW9uQXJncyAwCgltYXRjaCBhYmlfcm91dGVfY3JlYXRlQXBwbGljYXRpb24KCWVycgoKY2FsbF9Ob09wOgoJbWV0aG9kICJub25MaXRlcmFsU3RhdGljQXJyYXlBY2Nlc3MoKXVpbnQ2NCIKCXR4bmEgQXBwbGljYXRpb25BcmdzIDAKCW1hdGNoIGFiaV9yb3V0ZV9ub25MaXRlcmFsU3RhdGljQXJyYXlBY2Nlc3MKCWVycg==",
+    "approval": "I3ByYWdtYSB2ZXJzaW9uIDkKCi8vIFRoaXMgVEVBTCB3YXMgZ2VuZXJhdGVkIGJ5IFRFQUxTY3JpcHQgdjAuNzQuMAovLyBodHRwczovL2dpdGh1Yi5jb20vYWxnb3JhbmRmb3VuZGF0aW9uL1RFQUxTY3JpcHQKCi8vIFRoaXMgY29udHJhY3QgaXMgY29tcGxpYW50IHdpdGggYW5kL29yIGltcGxlbWVudHMgdGhlIGZvbGxvd2luZyBBUkNzOiBbIEFSQzQgXQoKLy8gVGhlIGZvbGxvd2luZyB0ZW4gbGluZXMgb2YgVEVBTCBoYW5kbGUgaW5pdGlhbCBwcm9ncmFtIGZsb3cKLy8gVGhpcyBwYXR0ZXJuIGlzIHVzZWQgdG8gbWFrZSBpdCBlYXN5IGZvciBhbnlvbmUgdG8gcGFyc2UgdGhlIHN0YXJ0IG9mIHRoZSBwcm9ncmFtIGFuZCBkZXRlcm1pbmUgaWYgYSBzcGVjaWZpYyBhY3Rpb24gaXMgYWxsb3dlZAovLyBIZXJlLCBhY3Rpb24gcmVmZXJzIHRvIHRoZSBPbkNvbXBsZXRlIGluIGNvbWJpbmF0aW9uIHdpdGggd2hldGhlciB0aGUgYXBwIGlzIGJlaW5nIGNyZWF0ZWQgb3IgY2FsbGVkCi8vIEV2ZXJ5IHBvc3NpYmxlIGFjdGlvbiBmb3IgdGhpcyBjb250cmFjdCBpcyByZXByZXNlbnRlZCBpbiB0aGUgc3dpdGNoIHN0YXRlbWVudAovLyBJZiB0aGUgYWN0aW9uIGlzIG5vdCBpbXBsbWVudGVkIGluIHRoZSBjb250cmFjdCwgaXRzIHJlc3BlY3RpdmUgYnJhbmNoIHdpbGwgYmUgIk5PVF9JTVBMRU1FTlRFRCIgd2hpY2gganVzdCBjb250YWlucyAiZXJyIgp0eG4gQXBwbGljYXRpb25JRAohCmludCA2CioKdHhuIE9uQ29tcGxldGlvbgorCnN3aXRjaCBjYWxsX05vT3AgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBjcmVhdGVfTm9PcCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVECgpOT1RfSU1QTEVNRU5URUQ6CgllcnIKCmFiaV9yb3V0ZV9ub25MaXRlcmFsU3RhdGljQXJyYXlBY2Nlc3M6CgkvLyBUaGUgQUJJIHJldHVybiBwcmVmaXgKCWJ5dGUgMHgxNTFmN2M3NQoKCS8vIGV4ZWN1dGUgbm9uTGl0ZXJhbFN0YXRpY0FycmF5QWNjZXNzKCl1aW50NjQKCWNhbGxzdWIgbm9uTGl0ZXJhbFN0YXRpY0FycmF5QWNjZXNzCglpdG9iCgljb25jYXQKCWxvZwoJaW50IDEKCXJldHVybgoKLy8gbm9uTGl0ZXJhbFN0YXRpY0FycmF5QWNjZXNzKCl1aW50NjQKbm9uTGl0ZXJhbFN0YXRpY0FycmF5QWNjZXNzOgoJcHJvdG8gMCAxCgoJLy8gUHVzaCBlbXB0eSBieXRlcyBhZnRlciB0aGUgZnJhbWUgcG9pbnRlciB0byByZXNlcnZlIHNwYWNlIGZvciBsb2NhbCB2YXJpYWJsZXMKCWJ5dGUgMHgKCWR1cAoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czo1NQoJLy8gYTogU3RhdGljQXJyYXk8dWludDY0LCAzPiA9IFsxMSwgMjIsIDMzXQoJYnl0ZSAweDAwMDAwMDAwMDAwMDAwMGIwMDAwMDAwMDAwMDAwMDE2MDAwMDAwMDAwMDAwMDAyMQoJZnJhbWVfYnVyeSAwIC8vIGE6IFN0YXRpY0FycmF5PHVpbnQ2NCwgMz4KCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6NTYKCS8vIG4gPSAyCglpbnQgMgoJZnJhbWVfYnVyeSAxIC8vIG46IHVpbnQ2NAoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czo1OAoJLy8gcmV0dXJuIGFbbl07CglmcmFtZV9kaWcgMCAvLyBhOiBTdGF0aWNBcnJheTx1aW50NjQsIDM+CglleHRyYWN0IDE2IDgKCWJ0b2kKCgkvLyBzZXQgdGhlIHN1YnJvdXRpbmUgcmV0dXJuIHZhbHVlCglmcmFtZV9idXJ5IDAKCgkvLyBwb3AgYWxsIGxvY2FsIHZhcmlhYmxlcyBmcm9tIHRoZSBzdGFjawoJcG9wbiAxCglyZXRzdWIKCmFiaV9yb3V0ZV9jcmVhdGVBcHBsaWNhdGlvbjoKCWludCAxCglyZXR1cm4KCmNyZWF0ZV9Ob09wOgoJbWV0aG9kICJjcmVhdGVBcHBsaWNhdGlvbigpdm9pZCIKCXR4bmEgQXBwbGljYXRpb25BcmdzIDAKCW1hdGNoIGFiaV9yb3V0ZV9jcmVhdGVBcHBsaWNhdGlvbgoJZXJyCgpjYWxsX05vT3A6CgltZXRob2QgIm5vbkxpdGVyYWxTdGF0aWNBcnJheUFjY2VzcygpdWludDY0IgoJdHhuYSBBcHBsaWNhdGlvbkFyZ3MgMAoJbWF0Y2ggYWJpX3JvdXRlX25vbkxpdGVyYWxTdGF0aWNBcnJheUFjY2VzcwoJZXJy",
     "clear": "I3ByYWdtYSB2ZXJzaW9uIDk="
   },
   "contract": {
diff --git a/tests/contracts/artifacts/ABITestPlusEqualsArrayValue.approval.teal b/tests/contracts/artifacts/ABITestPlusEqualsArrayValue.approval.teal
index 67482d830..d33d6c811 100644
--- a/tests/contracts/artifacts/ABITestPlusEqualsArrayValue.approval.teal
+++ b/tests/contracts/artifacts/ABITestPlusEqualsArrayValue.approval.teal
@@ -47,13 +47,14 @@ plusEqualsArrayValue:
 	// tests/contracts/abi.algo.ts:1243
 	// a[1] += 1
 	frame_dig 0 // a: StaticArray<uint64, 2>
+	int 8
 	frame_dig 0 // a: StaticArray<uint64, 2>
 	extract 8 8
 	btoi
 	int 1
 	+
 	itob
-	replace2 8
+	replace3
 	frame_bury 0 // a: StaticArray<uint64, 2>
 
 	// tests/contracts/abi.algo.ts:1244
diff --git a/tests/contracts/artifacts/ABITestPlusEqualsArrayValue.arc32.json b/tests/contracts/artifacts/ABITestPlusEqualsArrayValue.arc32.json
index e205c4568..e058fba5a 100644
--- a/tests/contracts/artifacts/ABITestPlusEqualsArrayValue.arc32.json
+++ b/tests/contracts/artifacts/ABITestPlusEqualsArrayValue.arc32.json
@@ -39,7 +39,7 @@
     }
   },
   "source": {
-    "approval": "I3ByYWdtYSB2ZXJzaW9uIDkKCi8vIFRoaXMgVEVBTCB3YXMgZ2VuZXJhdGVkIGJ5IFRFQUxTY3JpcHQgdjAuNzQuMAovLyBodHRwczovL2dpdGh1Yi5jb20vYWxnb3JhbmRmb3VuZGF0aW9uL1RFQUxTY3JpcHQKCi8vIFRoaXMgY29udHJhY3QgaXMgY29tcGxpYW50IHdpdGggYW5kL29yIGltcGxlbWVudHMgdGhlIGZvbGxvd2luZyBBUkNzOiBbIEFSQzQgXQoKLy8gVGhlIGZvbGxvd2luZyB0ZW4gbGluZXMgb2YgVEVBTCBoYW5kbGUgaW5pdGlhbCBwcm9ncmFtIGZsb3cKLy8gVGhpcyBwYXR0ZXJuIGlzIHVzZWQgdG8gbWFrZSBpdCBlYXN5IGZvciBhbnlvbmUgdG8gcGFyc2UgdGhlIHN0YXJ0IG9mIHRoZSBwcm9ncmFtIGFuZCBkZXRlcm1pbmUgaWYgYSBzcGVjaWZpYyBhY3Rpb24gaXMgYWxsb3dlZAovLyBIZXJlLCBhY3Rpb24gcmVmZXJzIHRvIHRoZSBPbkNvbXBsZXRlIGluIGNvbWJpbmF0aW9uIHdpdGggd2hldGhlciB0aGUgYXBwIGlzIGJlaW5nIGNyZWF0ZWQgb3IgY2FsbGVkCi8vIEV2ZXJ5IHBvc3NpYmxlIGFjdGlvbiBmb3IgdGhpcyBjb250cmFjdCBpcyByZXByZXNlbnRlZCBpbiB0aGUgc3dpdGNoIHN0YXRlbWVudAovLyBJZiB0aGUgYWN0aW9uIGlzIG5vdCBpbXBsbWVudGVkIGluIHRoZSBjb250cmFjdCwgaXRzIHJlc3BlY3RpdmUgYnJhbmNoIHdpbGwgYmUgIk5PVF9JTVBMRU1FTlRFRCIgd2hpY2gganVzdCBjb250YWlucyAiZXJyIgp0eG4gQXBwbGljYXRpb25JRAohCmludCA2CioKdHhuIE9uQ29tcGxldGlvbgorCnN3aXRjaCBjYWxsX05vT3AgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBjcmVhdGVfTm9PcCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVECgpOT1RfSU1QTEVNRU5URUQ6CgllcnIKCmFiaV9yb3V0ZV9wbHVzRXF1YWxzQXJyYXlWYWx1ZToKCS8vIFRoZSBBQkkgcmV0dXJuIHByZWZpeAoJYnl0ZSAweDE1MWY3Yzc1CgoJLy8gZXhlY3V0ZSBwbHVzRXF1YWxzQXJyYXlWYWx1ZSgpdWludDY0WzJdCgljYWxsc3ViIHBsdXNFcXVhbHNBcnJheVZhbHVlCgljb25jYXQKCWxvZwoJaW50IDEKCXJldHVybgoKLy8gcGx1c0VxdWFsc0FycmF5VmFsdWUoKXVpbnQ2NFsyXQpwbHVzRXF1YWxzQXJyYXlWYWx1ZToKCXByb3RvIDAgMQoKCS8vIFB1c2ggZW1wdHkgYnl0ZXMgYWZ0ZXIgdGhlIGZyYW1lIHBvaW50ZXIgdG8gcmVzZXJ2ZSBzcGFjZSBmb3IgbG9jYWwgdmFyaWFibGVzCglieXRlIDB4CgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjEyNDIKCS8vIGE6IFN0YXRpY0FycmF5PHVpbnQ2NCwgMj4gPSBbMSwgMl0KCWJ5dGUgMHgwMDAwMDAwMDAwMDAwMDAxMDAwMDAwMDAwMDAwMDAwMgoJZnJhbWVfYnVyeSAwIC8vIGE6IFN0YXRpY0FycmF5PHVpbnQ2NCwgMj4KCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTI0MwoJLy8gYVsxXSArPSAxCglmcmFtZV9kaWcgMCAvLyBhOiBTdGF0aWNBcnJheTx1aW50NjQsIDI+CglmcmFtZV9kaWcgMCAvLyBhOiBTdGF0aWNBcnJheTx1aW50NjQsIDI+CglleHRyYWN0IDggOAoJYnRvaQoJaW50IDEKCSsKCWl0b2IKCXJlcGxhY2UyIDgKCWZyYW1lX2J1cnkgMCAvLyBhOiBTdGF0aWNBcnJheTx1aW50NjQsIDI+CgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjEyNDQKCS8vIHJldHVybiBhOwoJZnJhbWVfZGlnIDAgLy8gYTogU3RhdGljQXJyYXk8dWludDY0LCAyPgoKCS8vIHNldCB0aGUgc3Vicm91dGluZSByZXR1cm4gdmFsdWUKCWZyYW1lX2J1cnkgMAoJcmV0c3ViCgphYmlfcm91dGVfY3JlYXRlQXBwbGljYXRpb246CglpbnQgMQoJcmV0dXJuCgpjcmVhdGVfTm9PcDoKCW1ldGhvZCAiY3JlYXRlQXBwbGljYXRpb24oKXZvaWQiCgl0eG5hIEFwcGxpY2F0aW9uQXJncyAwCgltYXRjaCBhYmlfcm91dGVfY3JlYXRlQXBwbGljYXRpb24KCWVycgoKY2FsbF9Ob09wOgoJbWV0aG9kICJwbHVzRXF1YWxzQXJyYXlWYWx1ZSgpdWludDY0WzJdIgoJdHhuYSBBcHBsaWNhdGlvbkFyZ3MgMAoJbWF0Y2ggYWJpX3JvdXRlX3BsdXNFcXVhbHNBcnJheVZhbHVlCgllcnI=",
+    "approval": "I3ByYWdtYSB2ZXJzaW9uIDkKCi8vIFRoaXMgVEVBTCB3YXMgZ2VuZXJhdGVkIGJ5IFRFQUxTY3JpcHQgdjAuNzQuMAovLyBodHRwczovL2dpdGh1Yi5jb20vYWxnb3JhbmRmb3VuZGF0aW9uL1RFQUxTY3JpcHQKCi8vIFRoaXMgY29udHJhY3QgaXMgY29tcGxpYW50IHdpdGggYW5kL29yIGltcGxlbWVudHMgdGhlIGZvbGxvd2luZyBBUkNzOiBbIEFSQzQgXQoKLy8gVGhlIGZvbGxvd2luZyB0ZW4gbGluZXMgb2YgVEVBTCBoYW5kbGUgaW5pdGlhbCBwcm9ncmFtIGZsb3cKLy8gVGhpcyBwYXR0ZXJuIGlzIHVzZWQgdG8gbWFrZSBpdCBlYXN5IGZvciBhbnlvbmUgdG8gcGFyc2UgdGhlIHN0YXJ0IG9mIHRoZSBwcm9ncmFtIGFuZCBkZXRlcm1pbmUgaWYgYSBzcGVjaWZpYyBhY3Rpb24gaXMgYWxsb3dlZAovLyBIZXJlLCBhY3Rpb24gcmVmZXJzIHRvIHRoZSBPbkNvbXBsZXRlIGluIGNvbWJpbmF0aW9uIHdpdGggd2hldGhlciB0aGUgYXBwIGlzIGJlaW5nIGNyZWF0ZWQgb3IgY2FsbGVkCi8vIEV2ZXJ5IHBvc3NpYmxlIGFjdGlvbiBmb3IgdGhpcyBjb250cmFjdCBpcyByZXByZXNlbnRlZCBpbiB0aGUgc3dpdGNoIHN0YXRlbWVudAovLyBJZiB0aGUgYWN0aW9uIGlzIG5vdCBpbXBsbWVudGVkIGluIHRoZSBjb250cmFjdCwgaXRzIHJlc3BlY3RpdmUgYnJhbmNoIHdpbGwgYmUgIk5PVF9JTVBMRU1FTlRFRCIgd2hpY2gganVzdCBjb250YWlucyAiZXJyIgp0eG4gQXBwbGljYXRpb25JRAohCmludCA2CioKdHhuIE9uQ29tcGxldGlvbgorCnN3aXRjaCBjYWxsX05vT3AgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBjcmVhdGVfTm9PcCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVECgpOT1RfSU1QTEVNRU5URUQ6CgllcnIKCmFiaV9yb3V0ZV9wbHVzRXF1YWxzQXJyYXlWYWx1ZToKCS8vIFRoZSBBQkkgcmV0dXJuIHByZWZpeAoJYnl0ZSAweDE1MWY3Yzc1CgoJLy8gZXhlY3V0ZSBwbHVzRXF1YWxzQXJyYXlWYWx1ZSgpdWludDY0WzJdCgljYWxsc3ViIHBsdXNFcXVhbHNBcnJheVZhbHVlCgljb25jYXQKCWxvZwoJaW50IDEKCXJldHVybgoKLy8gcGx1c0VxdWFsc0FycmF5VmFsdWUoKXVpbnQ2NFsyXQpwbHVzRXF1YWxzQXJyYXlWYWx1ZToKCXByb3RvIDAgMQoKCS8vIFB1c2ggZW1wdHkgYnl0ZXMgYWZ0ZXIgdGhlIGZyYW1lIHBvaW50ZXIgdG8gcmVzZXJ2ZSBzcGFjZSBmb3IgbG9jYWwgdmFyaWFibGVzCglieXRlIDB4CgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjEyNDIKCS8vIGE6IFN0YXRpY0FycmF5PHVpbnQ2NCwgMj4gPSBbMSwgMl0KCWJ5dGUgMHgwMDAwMDAwMDAwMDAwMDAxMDAwMDAwMDAwMDAwMDAwMgoJZnJhbWVfYnVyeSAwIC8vIGE6IFN0YXRpY0FycmF5PHVpbnQ2NCwgMj4KCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTI0MwoJLy8gYVsxXSArPSAxCglmcmFtZV9kaWcgMCAvLyBhOiBTdGF0aWNBcnJheTx1aW50NjQsIDI+CglpbnQgOAoJZnJhbWVfZGlnIDAgLy8gYTogU3RhdGljQXJyYXk8dWludDY0LCAyPgoJZXh0cmFjdCA4IDgKCWJ0b2kKCWludCAxCgkrCglpdG9iCglyZXBsYWNlMwoJZnJhbWVfYnVyeSAwIC8vIGE6IFN0YXRpY0FycmF5PHVpbnQ2NCwgMj4KCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTI0NAoJLy8gcmV0dXJuIGE7CglmcmFtZV9kaWcgMCAvLyBhOiBTdGF0aWNBcnJheTx1aW50NjQsIDI+CgoJLy8gc2V0IHRoZSBzdWJyb3V0aW5lIHJldHVybiB2YWx1ZQoJZnJhbWVfYnVyeSAwCglyZXRzdWIKCmFiaV9yb3V0ZV9jcmVhdGVBcHBsaWNhdGlvbjoKCWludCAxCglyZXR1cm4KCmNyZWF0ZV9Ob09wOgoJbWV0aG9kICJjcmVhdGVBcHBsaWNhdGlvbigpdm9pZCIKCXR4bmEgQXBwbGljYXRpb25BcmdzIDAKCW1hdGNoIGFiaV9yb3V0ZV9jcmVhdGVBcHBsaWNhdGlvbgoJZXJyCgpjYWxsX05vT3A6CgltZXRob2QgInBsdXNFcXVhbHNBcnJheVZhbHVlKCl1aW50NjRbMl0iCgl0eG5hIEFwcGxpY2F0aW9uQXJncyAwCgltYXRjaCBhYmlfcm91dGVfcGx1c0VxdWFsc0FycmF5VmFsdWUKCWVycg==",
     "clear": "I3ByYWdtYSB2ZXJzaW9uIDk="
   },
   "contract": {
diff --git a/tests/contracts/artifacts/ABITestPlusEqualsObjValue.approval.teal b/tests/contracts/artifacts/ABITestPlusEqualsObjValue.approval.teal
index 2204d69d7..70d3bedbc 100644
--- a/tests/contracts/artifacts/ABITestPlusEqualsObjValue.approval.teal
+++ b/tests/contracts/artifacts/ABITestPlusEqualsObjValue.approval.teal
@@ -47,13 +47,14 @@ plusEqualsObjValue:
 	// tests/contracts/abi.algo.ts:1251
 	// a.bar += 1
 	frame_dig 0 // a: { foo: uint64; bar: uint64 }
+	int 8 // headOffset
 	frame_dig 0 // a: { foo: uint64; bar: uint64 }
 	extract 8 8
 	btoi
 	int 1
 	+
 	itob
-	replace2 8
+	replace3
 	frame_bury 0 // a: { foo: uint64; bar: uint64 }
 
 	// tests/contracts/abi.algo.ts:1252
diff --git a/tests/contracts/artifacts/ABITestPlusEqualsObjValue.arc32.json b/tests/contracts/artifacts/ABITestPlusEqualsObjValue.arc32.json
index e31e09240..9c8b61490 100644
--- a/tests/contracts/artifacts/ABITestPlusEqualsObjValue.arc32.json
+++ b/tests/contracts/artifacts/ABITestPlusEqualsObjValue.arc32.json
@@ -39,7 +39,7 @@
     }
   },
   "source": {
-    "approval": "I3ByYWdtYSB2ZXJzaW9uIDkKCi8vIFRoaXMgVEVBTCB3YXMgZ2VuZXJhdGVkIGJ5IFRFQUxTY3JpcHQgdjAuNzQuMAovLyBodHRwczovL2dpdGh1Yi5jb20vYWxnb3JhbmRmb3VuZGF0aW9uL1RFQUxTY3JpcHQKCi8vIFRoaXMgY29udHJhY3QgaXMgY29tcGxpYW50IHdpdGggYW5kL29yIGltcGxlbWVudHMgdGhlIGZvbGxvd2luZyBBUkNzOiBbIEFSQzQgXQoKLy8gVGhlIGZvbGxvd2luZyB0ZW4gbGluZXMgb2YgVEVBTCBoYW5kbGUgaW5pdGlhbCBwcm9ncmFtIGZsb3cKLy8gVGhpcyBwYXR0ZXJuIGlzIHVzZWQgdG8gbWFrZSBpdCBlYXN5IGZvciBhbnlvbmUgdG8gcGFyc2UgdGhlIHN0YXJ0IG9mIHRoZSBwcm9ncmFtIGFuZCBkZXRlcm1pbmUgaWYgYSBzcGVjaWZpYyBhY3Rpb24gaXMgYWxsb3dlZAovLyBIZXJlLCBhY3Rpb24gcmVmZXJzIHRvIHRoZSBPbkNvbXBsZXRlIGluIGNvbWJpbmF0aW9uIHdpdGggd2hldGhlciB0aGUgYXBwIGlzIGJlaW5nIGNyZWF0ZWQgb3IgY2FsbGVkCi8vIEV2ZXJ5IHBvc3NpYmxlIGFjdGlvbiBmb3IgdGhpcyBjb250cmFjdCBpcyByZXByZXNlbnRlZCBpbiB0aGUgc3dpdGNoIHN0YXRlbWVudAovLyBJZiB0aGUgYWN0aW9uIGlzIG5vdCBpbXBsbWVudGVkIGluIHRoZSBjb250cmFjdCwgaXRzIHJlc3BlY3RpdmUgYnJhbmNoIHdpbGwgYmUgIk5PVF9JTVBMRU1FTlRFRCIgd2hpY2gganVzdCBjb250YWlucyAiZXJyIgp0eG4gQXBwbGljYXRpb25JRAohCmludCA2CioKdHhuIE9uQ29tcGxldGlvbgorCnN3aXRjaCBjYWxsX05vT3AgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBjcmVhdGVfTm9PcCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVECgpOT1RfSU1QTEVNRU5URUQ6CgllcnIKCmFiaV9yb3V0ZV9wbHVzRXF1YWxzT2JqVmFsdWU6CgkvLyBUaGUgQUJJIHJldHVybiBwcmVmaXgKCWJ5dGUgMHgxNTFmN2M3NQoKCS8vIGV4ZWN1dGUgcGx1c0VxdWFsc09ialZhbHVlKCkodWludDY0LHVpbnQ2NCkKCWNhbGxzdWIgcGx1c0VxdWFsc09ialZhbHVlCgljb25jYXQKCWxvZwoJaW50IDEKCXJldHVybgoKLy8gcGx1c0VxdWFsc09ialZhbHVlKCkodWludDY0LHVpbnQ2NCkKcGx1c0VxdWFsc09ialZhbHVlOgoJcHJvdG8gMCAxCgoJLy8gUHVzaCBlbXB0eSBieXRlcyBhZnRlciB0aGUgZnJhbWUgcG9pbnRlciB0byByZXNlcnZlIHNwYWNlIGZvciBsb2NhbCB2YXJpYWJsZXMKCWJ5dGUgMHgKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTI1MAoJLy8gYTogeyBmb286IHVpbnQ2NDsgYmFyOiB1aW50NjQgfSA9IHsgZm9vOiAzLCBiYXI6IDQgfQoJYnl0ZSAweDAwMDAwMDAwMDAwMDAwMDMwMDAwMDAwMDAwMDAwMDA0CglmcmFtZV9idXJ5IDAgLy8gYTogeyBmb286IHVpbnQ2NDsgYmFyOiB1aW50NjQgfQoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czoxMjUxCgkvLyBhLmJhciArPSAxCglmcmFtZV9kaWcgMCAvLyBhOiB7IGZvbzogdWludDY0OyBiYXI6IHVpbnQ2NCB9CglmcmFtZV9kaWcgMCAvLyBhOiB7IGZvbzogdWludDY0OyBiYXI6IHVpbnQ2NCB9CglleHRyYWN0IDggOAoJYnRvaQoJaW50IDEKCSsKCWl0b2IKCXJlcGxhY2UyIDgKCWZyYW1lX2J1cnkgMCAvLyBhOiB7IGZvbzogdWludDY0OyBiYXI6IHVpbnQ2NCB9CgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjEyNTIKCS8vIHJldHVybiBhOwoJZnJhbWVfZGlnIDAgLy8gYTogeyBmb286IHVpbnQ2NDsgYmFyOiB1aW50NjQgfQoKCS8vIHNldCB0aGUgc3Vicm91dGluZSByZXR1cm4gdmFsdWUKCWZyYW1lX2J1cnkgMAoJcmV0c3ViCgphYmlfcm91dGVfY3JlYXRlQXBwbGljYXRpb246CglpbnQgMQoJcmV0dXJuCgpjcmVhdGVfTm9PcDoKCW1ldGhvZCAiY3JlYXRlQXBwbGljYXRpb24oKXZvaWQiCgl0eG5hIEFwcGxpY2F0aW9uQXJncyAwCgltYXRjaCBhYmlfcm91dGVfY3JlYXRlQXBwbGljYXRpb24KCWVycgoKY2FsbF9Ob09wOgoJbWV0aG9kICJwbHVzRXF1YWxzT2JqVmFsdWUoKSh1aW50NjQsdWludDY0KSIKCXR4bmEgQXBwbGljYXRpb25BcmdzIDAKCW1hdGNoIGFiaV9yb3V0ZV9wbHVzRXF1YWxzT2JqVmFsdWUKCWVycg==",
+    "approval": "I3ByYWdtYSB2ZXJzaW9uIDkKCi8vIFRoaXMgVEVBTCB3YXMgZ2VuZXJhdGVkIGJ5IFRFQUxTY3JpcHQgdjAuNzQuMAovLyBodHRwczovL2dpdGh1Yi5jb20vYWxnb3JhbmRmb3VuZGF0aW9uL1RFQUxTY3JpcHQKCi8vIFRoaXMgY29udHJhY3QgaXMgY29tcGxpYW50IHdpdGggYW5kL29yIGltcGxlbWVudHMgdGhlIGZvbGxvd2luZyBBUkNzOiBbIEFSQzQgXQoKLy8gVGhlIGZvbGxvd2luZyB0ZW4gbGluZXMgb2YgVEVBTCBoYW5kbGUgaW5pdGlhbCBwcm9ncmFtIGZsb3cKLy8gVGhpcyBwYXR0ZXJuIGlzIHVzZWQgdG8gbWFrZSBpdCBlYXN5IGZvciBhbnlvbmUgdG8gcGFyc2UgdGhlIHN0YXJ0IG9mIHRoZSBwcm9ncmFtIGFuZCBkZXRlcm1pbmUgaWYgYSBzcGVjaWZpYyBhY3Rpb24gaXMgYWxsb3dlZAovLyBIZXJlLCBhY3Rpb24gcmVmZXJzIHRvIHRoZSBPbkNvbXBsZXRlIGluIGNvbWJpbmF0aW9uIHdpdGggd2hldGhlciB0aGUgYXBwIGlzIGJlaW5nIGNyZWF0ZWQgb3IgY2FsbGVkCi8vIEV2ZXJ5IHBvc3NpYmxlIGFjdGlvbiBmb3IgdGhpcyBjb250cmFjdCBpcyByZXByZXNlbnRlZCBpbiB0aGUgc3dpdGNoIHN0YXRlbWVudAovLyBJZiB0aGUgYWN0aW9uIGlzIG5vdCBpbXBsbWVudGVkIGluIHRoZSBjb250cmFjdCwgaXRzIHJlc3BlY3RpdmUgYnJhbmNoIHdpbGwgYmUgIk5PVF9JTVBMRU1FTlRFRCIgd2hpY2gganVzdCBjb250YWlucyAiZXJyIgp0eG4gQXBwbGljYXRpb25JRAohCmludCA2CioKdHhuIE9uQ29tcGxldGlvbgorCnN3aXRjaCBjYWxsX05vT3AgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBjcmVhdGVfTm9PcCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVECgpOT1RfSU1QTEVNRU5URUQ6CgllcnIKCmFiaV9yb3V0ZV9wbHVzRXF1YWxzT2JqVmFsdWU6CgkvLyBUaGUgQUJJIHJldHVybiBwcmVmaXgKCWJ5dGUgMHgxNTFmN2M3NQoKCS8vIGV4ZWN1dGUgcGx1c0VxdWFsc09ialZhbHVlKCkodWludDY0LHVpbnQ2NCkKCWNhbGxzdWIgcGx1c0VxdWFsc09ialZhbHVlCgljb25jYXQKCWxvZwoJaW50IDEKCXJldHVybgoKLy8gcGx1c0VxdWFsc09ialZhbHVlKCkodWludDY0LHVpbnQ2NCkKcGx1c0VxdWFsc09ialZhbHVlOgoJcHJvdG8gMCAxCgoJLy8gUHVzaCBlbXB0eSBieXRlcyBhZnRlciB0aGUgZnJhbWUgcG9pbnRlciB0byByZXNlcnZlIHNwYWNlIGZvciBsb2NhbCB2YXJpYWJsZXMKCWJ5dGUgMHgKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTI1MAoJLy8gYTogeyBmb286IHVpbnQ2NDsgYmFyOiB1aW50NjQgfSA9IHsgZm9vOiAzLCBiYXI6IDQgfQoJYnl0ZSAweDAwMDAwMDAwMDAwMDAwMDMwMDAwMDAwMDAwMDAwMDA0CglmcmFtZV9idXJ5IDAgLy8gYTogeyBmb286IHVpbnQ2NDsgYmFyOiB1aW50NjQgfQoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czoxMjUxCgkvLyBhLmJhciArPSAxCglmcmFtZV9kaWcgMCAvLyBhOiB7IGZvbzogdWludDY0OyBiYXI6IHVpbnQ2NCB9CglpbnQgOCAvLyBoZWFkT2Zmc2V0CglmcmFtZV9kaWcgMCAvLyBhOiB7IGZvbzogdWludDY0OyBiYXI6IHVpbnQ2NCB9CglleHRyYWN0IDggOAoJYnRvaQoJaW50IDEKCSsKCWl0b2IKCXJlcGxhY2UzCglmcmFtZV9idXJ5IDAgLy8gYTogeyBmb286IHVpbnQ2NDsgYmFyOiB1aW50NjQgfQoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czoxMjUyCgkvLyByZXR1cm4gYTsKCWZyYW1lX2RpZyAwIC8vIGE6IHsgZm9vOiB1aW50NjQ7IGJhcjogdWludDY0IH0KCgkvLyBzZXQgdGhlIHN1YnJvdXRpbmUgcmV0dXJuIHZhbHVlCglmcmFtZV9idXJ5IDAKCXJldHN1YgoKYWJpX3JvdXRlX2NyZWF0ZUFwcGxpY2F0aW9uOgoJaW50IDEKCXJldHVybgoKY3JlYXRlX05vT3A6CgltZXRob2QgImNyZWF0ZUFwcGxpY2F0aW9uKCl2b2lkIgoJdHhuYSBBcHBsaWNhdGlvbkFyZ3MgMAoJbWF0Y2ggYWJpX3JvdXRlX2NyZWF0ZUFwcGxpY2F0aW9uCgllcnIKCmNhbGxfTm9PcDoKCW1ldGhvZCAicGx1c0VxdWFsc09ialZhbHVlKCkodWludDY0LHVpbnQ2NCkiCgl0eG5hIEFwcGxpY2F0aW9uQXJncyAwCgltYXRjaCBhYmlfcm91dGVfcGx1c0VxdWFsc09ialZhbHVlCgllcnI=",
     "clear": "I3ByYWdtYSB2ZXJzaW9uIDk="
   },
   "contract": {
diff --git a/tests/contracts/artifacts/ABITestPlusEqualsObjValueInBox.approval.teal b/tests/contracts/artifacts/ABITestPlusEqualsObjValueInBox.approval.teal
index c6145319b..5167f3040 100644
--- a/tests/contracts/artifacts/ABITestPlusEqualsObjValueInBox.approval.teal
+++ b/tests/contracts/artifacts/ABITestPlusEqualsObjValueInBox.approval.teal
@@ -44,11 +44,11 @@ plusEqualsObjValueInBox:
 
 	// tests/contracts/abi.algo.ts:1261
 	// this.bMap('bMap').value.bar += 1
-	int 8
+	int 8 // headOffset
 	byte 0x624d6170 // "bMap"
-	box_get
-	assert
-	extract 8 8
+	int 8 // headOffset
+	int 8
+	box_extract
 	btoi
 	int 1
 	+
diff --git a/tests/contracts/artifacts/ABITestPlusEqualsObjValueInBox.arc32.json b/tests/contracts/artifacts/ABITestPlusEqualsObjValueInBox.arc32.json
index 81815c114..bf3681484 100644
--- a/tests/contracts/artifacts/ABITestPlusEqualsObjValueInBox.arc32.json
+++ b/tests/contracts/artifacts/ABITestPlusEqualsObjValueInBox.arc32.json
@@ -39,7 +39,7 @@
     }
   },
   "source": {
-    "approval": "I3ByYWdtYSB2ZXJzaW9uIDkKCi8vIFRoaXMgVEVBTCB3YXMgZ2VuZXJhdGVkIGJ5IFRFQUxTY3JpcHQgdjAuNzQuMAovLyBodHRwczovL2dpdGh1Yi5jb20vYWxnb3JhbmRmb3VuZGF0aW9uL1RFQUxTY3JpcHQKCi8vIFRoaXMgY29udHJhY3QgaXMgY29tcGxpYW50IHdpdGggYW5kL29yIGltcGxlbWVudHMgdGhlIGZvbGxvd2luZyBBUkNzOiBbIEFSQzQgXQoKLy8gVGhlIGZvbGxvd2luZyB0ZW4gbGluZXMgb2YgVEVBTCBoYW5kbGUgaW5pdGlhbCBwcm9ncmFtIGZsb3cKLy8gVGhpcyBwYXR0ZXJuIGlzIHVzZWQgdG8gbWFrZSBpdCBlYXN5IGZvciBhbnlvbmUgdG8gcGFyc2UgdGhlIHN0YXJ0IG9mIHRoZSBwcm9ncmFtIGFuZCBkZXRlcm1pbmUgaWYgYSBzcGVjaWZpYyBhY3Rpb24gaXMgYWxsb3dlZAovLyBIZXJlLCBhY3Rpb24gcmVmZXJzIHRvIHRoZSBPbkNvbXBsZXRlIGluIGNvbWJpbmF0aW9uIHdpdGggd2hldGhlciB0aGUgYXBwIGlzIGJlaW5nIGNyZWF0ZWQgb3IgY2FsbGVkCi8vIEV2ZXJ5IHBvc3NpYmxlIGFjdGlvbiBmb3IgdGhpcyBjb250cmFjdCBpcyByZXByZXNlbnRlZCBpbiB0aGUgc3dpdGNoIHN0YXRlbWVudAovLyBJZiB0aGUgYWN0aW9uIGlzIG5vdCBpbXBsbWVudGVkIGluIHRoZSBjb250cmFjdCwgaXRzIHJlc3BlY3RpdmUgYnJhbmNoIHdpbGwgYmUgIk5PVF9JTVBMRU1FTlRFRCIgd2hpY2gganVzdCBjb250YWlucyAiZXJyIgp0eG4gQXBwbGljYXRpb25JRAohCmludCA2CioKdHhuIE9uQ29tcGxldGlvbgorCnN3aXRjaCBjYWxsX05vT3AgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBjcmVhdGVfTm9PcCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVECgpOT1RfSU1QTEVNRU5URUQ6CgllcnIKCmFiaV9yb3V0ZV9wbHVzRXF1YWxzT2JqVmFsdWVJbkJveDoKCS8vIFRoZSBBQkkgcmV0dXJuIHByZWZpeAoJYnl0ZSAweDE1MWY3Yzc1CgoJLy8gZXhlY3V0ZSBwbHVzRXF1YWxzT2JqVmFsdWVJbkJveCgpKHVpbnQ2NCx1aW50NjQpCgljYWxsc3ViIHBsdXNFcXVhbHNPYmpWYWx1ZUluQm94Cgljb25jYXQKCWxvZwoJaW50IDEKCXJldHVybgoKLy8gcGx1c0VxdWFsc09ialZhbHVlSW5Cb3goKSh1aW50NjQsdWludDY0KQpwbHVzRXF1YWxzT2JqVmFsdWVJbkJveDoKCXByb3RvIDAgMQoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czoxMjYwCgkvLyB0aGlzLmJNYXAoJ2JNYXAnKS52YWx1ZSA9IHsgZm9vOiAzLCBiYXI6IDQgfQoJYnl0ZSAweDYyNGQ2MTcwIC8vICJiTWFwIgoJYnl0ZSAweDAwMDAwMDAwMDAwMDAwMDMwMDAwMDAwMDAwMDAwMDA0Cglib3hfcHV0CgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjEyNjEKCS8vIHRoaXMuYk1hcCgnYk1hcCcpLnZhbHVlLmJhciArPSAxCglpbnQgOAoJYnl0ZSAweDYyNGQ2MTcwIC8vICJiTWFwIgoJYm94X2dldAoJYXNzZXJ0CglleHRyYWN0IDggOAoJYnRvaQoJaW50IDEKCSsKCWl0b2IKCWJ5dGUgMHg2MjRkNjE3MCAvLyAiYk1hcCIKCWNvdmVyIDIKCWJveF9yZXBsYWNlCgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjEyNjIKCS8vIHJldHVybiB0aGlzLmJNYXAoJ2JNYXAnKS52YWx1ZTsKCWJ5dGUgMHg2MjRkNjE3MCAvLyAiYk1hcCIKCWJveF9nZXQKCWFzc2VydAoJcmV0c3ViCgphYmlfcm91dGVfY3JlYXRlQXBwbGljYXRpb246CglpbnQgMQoJcmV0dXJuCgpjcmVhdGVfTm9PcDoKCW1ldGhvZCAiY3JlYXRlQXBwbGljYXRpb24oKXZvaWQiCgl0eG5hIEFwcGxpY2F0aW9uQXJncyAwCgltYXRjaCBhYmlfcm91dGVfY3JlYXRlQXBwbGljYXRpb24KCWVycgoKY2FsbF9Ob09wOgoJbWV0aG9kICJwbHVzRXF1YWxzT2JqVmFsdWVJbkJveCgpKHVpbnQ2NCx1aW50NjQpIgoJdHhuYSBBcHBsaWNhdGlvbkFyZ3MgMAoJbWF0Y2ggYWJpX3JvdXRlX3BsdXNFcXVhbHNPYmpWYWx1ZUluQm94CgllcnI=",
+    "approval": "I3ByYWdtYSB2ZXJzaW9uIDkKCi8vIFRoaXMgVEVBTCB3YXMgZ2VuZXJhdGVkIGJ5IFRFQUxTY3JpcHQgdjAuNzQuMAovLyBodHRwczovL2dpdGh1Yi5jb20vYWxnb3JhbmRmb3VuZGF0aW9uL1RFQUxTY3JpcHQKCi8vIFRoaXMgY29udHJhY3QgaXMgY29tcGxpYW50IHdpdGggYW5kL29yIGltcGxlbWVudHMgdGhlIGZvbGxvd2luZyBBUkNzOiBbIEFSQzQgXQoKLy8gVGhlIGZvbGxvd2luZyB0ZW4gbGluZXMgb2YgVEVBTCBoYW5kbGUgaW5pdGlhbCBwcm9ncmFtIGZsb3cKLy8gVGhpcyBwYXR0ZXJuIGlzIHVzZWQgdG8gbWFrZSBpdCBlYXN5IGZvciBhbnlvbmUgdG8gcGFyc2UgdGhlIHN0YXJ0IG9mIHRoZSBwcm9ncmFtIGFuZCBkZXRlcm1pbmUgaWYgYSBzcGVjaWZpYyBhY3Rpb24gaXMgYWxsb3dlZAovLyBIZXJlLCBhY3Rpb24gcmVmZXJzIHRvIHRoZSBPbkNvbXBsZXRlIGluIGNvbWJpbmF0aW9uIHdpdGggd2hldGhlciB0aGUgYXBwIGlzIGJlaW5nIGNyZWF0ZWQgb3IgY2FsbGVkCi8vIEV2ZXJ5IHBvc3NpYmxlIGFjdGlvbiBmb3IgdGhpcyBjb250cmFjdCBpcyByZXByZXNlbnRlZCBpbiB0aGUgc3dpdGNoIHN0YXRlbWVudAovLyBJZiB0aGUgYWN0aW9uIGlzIG5vdCBpbXBsbWVudGVkIGluIHRoZSBjb250cmFjdCwgaXRzIHJlc3BlY3RpdmUgYnJhbmNoIHdpbGwgYmUgIk5PVF9JTVBMRU1FTlRFRCIgd2hpY2gganVzdCBjb250YWlucyAiZXJyIgp0eG4gQXBwbGljYXRpb25JRAohCmludCA2CioKdHhuIE9uQ29tcGxldGlvbgorCnN3aXRjaCBjYWxsX05vT3AgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBjcmVhdGVfTm9PcCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVECgpOT1RfSU1QTEVNRU5URUQ6CgllcnIKCmFiaV9yb3V0ZV9wbHVzRXF1YWxzT2JqVmFsdWVJbkJveDoKCS8vIFRoZSBBQkkgcmV0dXJuIHByZWZpeAoJYnl0ZSAweDE1MWY3Yzc1CgoJLy8gZXhlY3V0ZSBwbHVzRXF1YWxzT2JqVmFsdWVJbkJveCgpKHVpbnQ2NCx1aW50NjQpCgljYWxsc3ViIHBsdXNFcXVhbHNPYmpWYWx1ZUluQm94Cgljb25jYXQKCWxvZwoJaW50IDEKCXJldHVybgoKLy8gcGx1c0VxdWFsc09ialZhbHVlSW5Cb3goKSh1aW50NjQsdWludDY0KQpwbHVzRXF1YWxzT2JqVmFsdWVJbkJveDoKCXByb3RvIDAgMQoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czoxMjYwCgkvLyB0aGlzLmJNYXAoJ2JNYXAnKS52YWx1ZSA9IHsgZm9vOiAzLCBiYXI6IDQgfQoJYnl0ZSAweDYyNGQ2MTcwIC8vICJiTWFwIgoJYnl0ZSAweDAwMDAwMDAwMDAwMDAwMDMwMDAwMDAwMDAwMDAwMDA0Cglib3hfcHV0CgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjEyNjEKCS8vIHRoaXMuYk1hcCgnYk1hcCcpLnZhbHVlLmJhciArPSAxCglpbnQgOCAvLyBoZWFkT2Zmc2V0CglieXRlIDB4NjI0ZDYxNzAgLy8gImJNYXAiCglpbnQgOCAvLyBoZWFkT2Zmc2V0CglpbnQgOAoJYm94X2V4dHJhY3QKCWJ0b2kKCWludCAxCgkrCglpdG9iCglieXRlIDB4NjI0ZDYxNzAgLy8gImJNYXAiCgljb3ZlciAyCglib3hfcmVwbGFjZQoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czoxMjYyCgkvLyByZXR1cm4gdGhpcy5iTWFwKCdiTWFwJykudmFsdWU7CglieXRlIDB4NjI0ZDYxNzAgLy8gImJNYXAiCglib3hfZ2V0Cglhc3NlcnQKCXJldHN1YgoKYWJpX3JvdXRlX2NyZWF0ZUFwcGxpY2F0aW9uOgoJaW50IDEKCXJldHVybgoKY3JlYXRlX05vT3A6CgltZXRob2QgImNyZWF0ZUFwcGxpY2F0aW9uKCl2b2lkIgoJdHhuYSBBcHBsaWNhdGlvbkFyZ3MgMAoJbWF0Y2ggYWJpX3JvdXRlX2NyZWF0ZUFwcGxpY2F0aW9uCgllcnIKCmNhbGxfTm9PcDoKCW1ldGhvZCAicGx1c0VxdWFsc09ialZhbHVlSW5Cb3goKSh1aW50NjQsdWludDY0KSIKCXR4bmEgQXBwbGljYXRpb25BcmdzIDAKCW1hdGNoIGFiaV9yb3V0ZV9wbHVzRXF1YWxzT2JqVmFsdWVJbkJveAoJZXJy",
     "clear": "I3ByYWdtYSB2ZXJzaW9uIDk="
   },
   "contract": {
diff --git a/tests/contracts/artifacts/ABITestStaticArrayInStorageMap.approval.teal b/tests/contracts/artifacts/ABITestStaticArrayInStorageMap.approval.teal
index 39b7262cf..e1a2cdece 100644
--- a/tests/contracts/artifacts/ABITestStaticArrayInStorageMap.approval.teal
+++ b/tests/contracts/artifacts/ABITestStaticArrayInStorageMap.approval.teal
@@ -83,9 +83,9 @@ staticArrayInStorageMap:
 	itob
 	concat
 	byte 0x624d6170 // "bMap"
-	box_get
-	assert
-	extract 8 8
+	int 8
+	dup
+	box_extract
 	btoi
 	itob
 	concat
diff --git a/tests/contracts/artifacts/ABITestStaticArrayInStorageMap.arc32.json b/tests/contracts/artifacts/ABITestStaticArrayInStorageMap.arc32.json
index 0f896b749..3565a583c 100644
--- a/tests/contracts/artifacts/ABITestStaticArrayInStorageMap.arc32.json
+++ b/tests/contracts/artifacts/ABITestStaticArrayInStorageMap.arc32.json
@@ -49,7 +49,7 @@
     }
   },
   "source": {
-    "approval": "I3ByYWdtYSB2ZXJzaW9uIDkKCi8vIFRoaXMgVEVBTCB3YXMgZ2VuZXJhdGVkIGJ5IFRFQUxTY3JpcHQgdjAuNzQuMAovLyBodHRwczovL2dpdGh1Yi5jb20vYWxnb3JhbmRmb3VuZGF0aW9uL1RFQUxTY3JpcHQKCi8vIFRoaXMgY29udHJhY3QgaXMgY29tcGxpYW50IHdpdGggYW5kL29yIGltcGxlbWVudHMgdGhlIGZvbGxvd2luZyBBUkNzOiBbIEFSQzQgXQoKLy8gVGhlIGZvbGxvd2luZyB0ZW4gbGluZXMgb2YgVEVBTCBoYW5kbGUgaW5pdGlhbCBwcm9ncmFtIGZsb3cKLy8gVGhpcyBwYXR0ZXJuIGlzIHVzZWQgdG8gbWFrZSBpdCBlYXN5IGZvciBhbnlvbmUgdG8gcGFyc2UgdGhlIHN0YXJ0IG9mIHRoZSBwcm9ncmFtIGFuZCBkZXRlcm1pbmUgaWYgYSBzcGVjaWZpYyBhY3Rpb24gaXMgYWxsb3dlZAovLyBIZXJlLCBhY3Rpb24gcmVmZXJzIHRvIHRoZSBPbkNvbXBsZXRlIGluIGNvbWJpbmF0aW9uIHdpdGggd2hldGhlciB0aGUgYXBwIGlzIGJlaW5nIGNyZWF0ZWQgb3IgY2FsbGVkCi8vIEV2ZXJ5IHBvc3NpYmxlIGFjdGlvbiBmb3IgdGhpcyBjb250cmFjdCBpcyByZXByZXNlbnRlZCBpbiB0aGUgc3dpdGNoIHN0YXRlbWVudAovLyBJZiB0aGUgYWN0aW9uIGlzIG5vdCBpbXBsbWVudGVkIGluIHRoZSBjb250cmFjdCwgaXRzIHJlc3BlY3RpdmUgYnJhbmNoIHdpbGwgYmUgIk5PVF9JTVBMRU1FTlRFRCIgd2hpY2gganVzdCBjb250YWlucyAiZXJyIgp0eG4gQXBwbGljYXRpb25JRAohCmludCA2CioKdHhuIE9uQ29tcGxldGlvbgorCnN3aXRjaCBOT1RfSU1QTEVNRU5URUQgY2FsbF9PcHRJbiBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgY3JlYXRlX05vT3AgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRAoKTk9UX0lNUExFTUVOVEVEOgoJZXJyCgphYmlfcm91dGVfc3RhdGljQXJyYXlJblN0b3JhZ2VNYXA6CgkvLyBUaGUgQUJJIHJldHVybiBwcmVmaXgKCWJ5dGUgMHgxNTFmN2M3NQoKCS8vIGV4ZWN1dGUgc3RhdGljQXJyYXlJblN0b3JhZ2VNYXAoKXVpbnQ2NFszXQoJY2FsbHN1YiBzdGF0aWNBcnJheUluU3RvcmFnZU1hcAoJY29uY2F0Cglsb2cKCWludCAxCglyZXR1cm4KCi8vIHN0YXRpY0FycmF5SW5TdG9yYWdlTWFwKCl1aW50NjRbM10Kc3RhdGljQXJyYXlJblN0b3JhZ2VNYXA6Cglwcm90byAwIDEKCgkvLyBQdXNoIGVtcHR5IGJ5dGVzIGFmdGVyIHRoZSBmcmFtZSBwb2ludGVyIHRvIHJlc2VydmUgc3BhY2UgZm9yIGxvY2FsIHZhcmlhYmxlcwoJYnl0ZSAweAoJZHVwCgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjE0NQoJLy8gYTogU3RhdGljQXJyYXk8dWludDY0LCAzPiA9IFsxMSwgMjIsIDMzXQoJYnl0ZSAweDAwMDAwMDAwMDAwMDAwMGIwMDAwMDAwMDAwMDAwMDE2MDAwMDAwMDAwMDAwMDAyMQoJZnJhbWVfYnVyeSAwIC8vIGE6IFN0YXRpY0FycmF5PHVpbnQ2NCwgMz4KCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTQ3CgkvLyB0aGlzLmdNYXAoJ2dNYXAnKS52YWx1ZSA9IGEKCWJ5dGUgMHg2NzRkNjE3MCAvLyAiZ01hcCIKCWZyYW1lX2RpZyAwIC8vIGE6IFN0YXRpY0FycmF5PHVpbnQ2NCwgMz4KCWFwcF9nbG9iYWxfcHV0CgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjE0OAoJLy8gdGhpcy5sTWFwKHRoaXMudHhuLnNlbmRlciwgJ2xNYXAnKS52YWx1ZSA9IGEKCXR4biBTZW5kZXIKCWJ5dGUgMHg2YzRkNjE3MCAvLyAibE1hcCIKCWZyYW1lX2RpZyAwIC8vIGE6IFN0YXRpY0FycmF5PHVpbnQ2NCwgMz4KCWFwcF9sb2NhbF9wdXQKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTQ5CgkvLyB0aGlzLmJNYXAoJ2JNYXAnKS52YWx1ZSA9IGEKCWJ5dGUgMHg2MjRkNjE3MCAvLyAiYk1hcCIKCWZyYW1lX2RpZyAwIC8vIGE6IFN0YXRpY0FycmF5PHVpbnQ2NCwgMz4KCWJveF9wdXQKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTUxCgkvLyByZXQ6IFN0YXRpY0FycmF5PHVpbnQ2NCwgMz4gPSBbCgkvLyAgICAgICB0aGlzLmdNYXAoJ2dNYXAnKS52YWx1ZVsxXSwKCS8vICAgICAgIHRoaXMubE1hcCh0aGlzLnR4bi5zZW5kZXIsICdsTWFwJykudmFsdWVbMV0sCgkvLyAgICAgICB0aGlzLmJNYXAoJ2JNYXAnKS52YWx1ZVsxXSwKCS8vICAgICBdCglieXRlIDB4Njc0ZDYxNzAgLy8gImdNYXAiCglhcHBfZ2xvYmFsX2dldAoJZXh0cmFjdCA4IDgKCWJ0b2kKCWl0b2IKCXR4biBTZW5kZXIKCWJ5dGUgMHg2YzRkNjE3MCAvLyAibE1hcCIKCWFwcF9sb2NhbF9nZXQKCWV4dHJhY3QgOCA4CglidG9pCglpdG9iCgljb25jYXQKCWJ5dGUgMHg2MjRkNjE3MCAvLyAiYk1hcCIKCWJveF9nZXQKCWFzc2VydAoJZXh0cmFjdCA4IDgKCWJ0b2kKCWl0b2IKCWNvbmNhdAoJZnJhbWVfYnVyeSAxIC8vIHJldDogU3RhdGljQXJyYXk8dWludDY0LCAzPgoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czoxNTcKCS8vIHJldHVybiByZXQ7CglmcmFtZV9kaWcgMSAvLyByZXQ6IFN0YXRpY0FycmF5PHVpbnQ2NCwgMz4KCgkvLyBzZXQgdGhlIHN1YnJvdXRpbmUgcmV0dXJuIHZhbHVlCglmcmFtZV9idXJ5IDAKCgkvLyBwb3AgYWxsIGxvY2FsIHZhcmlhYmxlcyBmcm9tIHRoZSBzdGFjawoJcG9wbiAxCglyZXRzdWIKCmFiaV9yb3V0ZV9jcmVhdGVBcHBsaWNhdGlvbjoKCWludCAxCglyZXR1cm4KCmNyZWF0ZV9Ob09wOgoJbWV0aG9kICJjcmVhdGVBcHBsaWNhdGlvbigpdm9pZCIKCXR4bmEgQXBwbGljYXRpb25BcmdzIDAKCW1hdGNoIGFiaV9yb3V0ZV9jcmVhdGVBcHBsaWNhdGlvbgoJZXJyCgpjYWxsX09wdEluOgoJbWV0aG9kICJzdGF0aWNBcnJheUluU3RvcmFnZU1hcCgpdWludDY0WzNdIgoJdHhuYSBBcHBsaWNhdGlvbkFyZ3MgMAoJbWF0Y2ggYWJpX3JvdXRlX3N0YXRpY0FycmF5SW5TdG9yYWdlTWFwCgllcnI=",
+    "approval": "I3ByYWdtYSB2ZXJzaW9uIDkKCi8vIFRoaXMgVEVBTCB3YXMgZ2VuZXJhdGVkIGJ5IFRFQUxTY3JpcHQgdjAuNzQuMAovLyBodHRwczovL2dpdGh1Yi5jb20vYWxnb3JhbmRmb3VuZGF0aW9uL1RFQUxTY3JpcHQKCi8vIFRoaXMgY29udHJhY3QgaXMgY29tcGxpYW50IHdpdGggYW5kL29yIGltcGxlbWVudHMgdGhlIGZvbGxvd2luZyBBUkNzOiBbIEFSQzQgXQoKLy8gVGhlIGZvbGxvd2luZyB0ZW4gbGluZXMgb2YgVEVBTCBoYW5kbGUgaW5pdGlhbCBwcm9ncmFtIGZsb3cKLy8gVGhpcyBwYXR0ZXJuIGlzIHVzZWQgdG8gbWFrZSBpdCBlYXN5IGZvciBhbnlvbmUgdG8gcGFyc2UgdGhlIHN0YXJ0IG9mIHRoZSBwcm9ncmFtIGFuZCBkZXRlcm1pbmUgaWYgYSBzcGVjaWZpYyBhY3Rpb24gaXMgYWxsb3dlZAovLyBIZXJlLCBhY3Rpb24gcmVmZXJzIHRvIHRoZSBPbkNvbXBsZXRlIGluIGNvbWJpbmF0aW9uIHdpdGggd2hldGhlciB0aGUgYXBwIGlzIGJlaW5nIGNyZWF0ZWQgb3IgY2FsbGVkCi8vIEV2ZXJ5IHBvc3NpYmxlIGFjdGlvbiBmb3IgdGhpcyBjb250cmFjdCBpcyByZXByZXNlbnRlZCBpbiB0aGUgc3dpdGNoIHN0YXRlbWVudAovLyBJZiB0aGUgYWN0aW9uIGlzIG5vdCBpbXBsbWVudGVkIGluIHRoZSBjb250cmFjdCwgaXRzIHJlc3BlY3RpdmUgYnJhbmNoIHdpbGwgYmUgIk5PVF9JTVBMRU1FTlRFRCIgd2hpY2gganVzdCBjb250YWlucyAiZXJyIgp0eG4gQXBwbGljYXRpb25JRAohCmludCA2CioKdHhuIE9uQ29tcGxldGlvbgorCnN3aXRjaCBOT1RfSU1QTEVNRU5URUQgY2FsbF9PcHRJbiBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgY3JlYXRlX05vT3AgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRAoKTk9UX0lNUExFTUVOVEVEOgoJZXJyCgphYmlfcm91dGVfc3RhdGljQXJyYXlJblN0b3JhZ2VNYXA6CgkvLyBUaGUgQUJJIHJldHVybiBwcmVmaXgKCWJ5dGUgMHgxNTFmN2M3NQoKCS8vIGV4ZWN1dGUgc3RhdGljQXJyYXlJblN0b3JhZ2VNYXAoKXVpbnQ2NFszXQoJY2FsbHN1YiBzdGF0aWNBcnJheUluU3RvcmFnZU1hcAoJY29uY2F0Cglsb2cKCWludCAxCglyZXR1cm4KCi8vIHN0YXRpY0FycmF5SW5TdG9yYWdlTWFwKCl1aW50NjRbM10Kc3RhdGljQXJyYXlJblN0b3JhZ2VNYXA6Cglwcm90byAwIDEKCgkvLyBQdXNoIGVtcHR5IGJ5dGVzIGFmdGVyIHRoZSBmcmFtZSBwb2ludGVyIHRvIHJlc2VydmUgc3BhY2UgZm9yIGxvY2FsIHZhcmlhYmxlcwoJYnl0ZSAweAoJZHVwCgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjE0NQoJLy8gYTogU3RhdGljQXJyYXk8dWludDY0LCAzPiA9IFsxMSwgMjIsIDMzXQoJYnl0ZSAweDAwMDAwMDAwMDAwMDAwMGIwMDAwMDAwMDAwMDAwMDE2MDAwMDAwMDAwMDAwMDAyMQoJZnJhbWVfYnVyeSAwIC8vIGE6IFN0YXRpY0FycmF5PHVpbnQ2NCwgMz4KCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTQ3CgkvLyB0aGlzLmdNYXAoJ2dNYXAnKS52YWx1ZSA9IGEKCWJ5dGUgMHg2NzRkNjE3MCAvLyAiZ01hcCIKCWZyYW1lX2RpZyAwIC8vIGE6IFN0YXRpY0FycmF5PHVpbnQ2NCwgMz4KCWFwcF9nbG9iYWxfcHV0CgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjE0OAoJLy8gdGhpcy5sTWFwKHRoaXMudHhuLnNlbmRlciwgJ2xNYXAnKS52YWx1ZSA9IGEKCXR4biBTZW5kZXIKCWJ5dGUgMHg2YzRkNjE3MCAvLyAibE1hcCIKCWZyYW1lX2RpZyAwIC8vIGE6IFN0YXRpY0FycmF5PHVpbnQ2NCwgMz4KCWFwcF9sb2NhbF9wdXQKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTQ5CgkvLyB0aGlzLmJNYXAoJ2JNYXAnKS52YWx1ZSA9IGEKCWJ5dGUgMHg2MjRkNjE3MCAvLyAiYk1hcCIKCWZyYW1lX2RpZyAwIC8vIGE6IFN0YXRpY0FycmF5PHVpbnQ2NCwgMz4KCWJveF9wdXQKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTUxCgkvLyByZXQ6IFN0YXRpY0FycmF5PHVpbnQ2NCwgMz4gPSBbCgkvLyAgICAgICB0aGlzLmdNYXAoJ2dNYXAnKS52YWx1ZVsxXSwKCS8vICAgICAgIHRoaXMubE1hcCh0aGlzLnR4bi5zZW5kZXIsICdsTWFwJykudmFsdWVbMV0sCgkvLyAgICAgICB0aGlzLmJNYXAoJ2JNYXAnKS52YWx1ZVsxXSwKCS8vICAgICBdCglieXRlIDB4Njc0ZDYxNzAgLy8gImdNYXAiCglhcHBfZ2xvYmFsX2dldAoJZXh0cmFjdCA4IDgKCWJ0b2kKCWl0b2IKCXR4biBTZW5kZXIKCWJ5dGUgMHg2YzRkNjE3MCAvLyAibE1hcCIKCWFwcF9sb2NhbF9nZXQKCWV4dHJhY3QgOCA4CglidG9pCglpdG9iCgljb25jYXQKCWJ5dGUgMHg2MjRkNjE3MCAvLyAiYk1hcCIKCWludCA4CglkdXAKCWJveF9leHRyYWN0CglidG9pCglpdG9iCgljb25jYXQKCWZyYW1lX2J1cnkgMSAvLyByZXQ6IFN0YXRpY0FycmF5PHVpbnQ2NCwgMz4KCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTU3CgkvLyByZXR1cm4gcmV0OwoJZnJhbWVfZGlnIDEgLy8gcmV0OiBTdGF0aWNBcnJheTx1aW50NjQsIDM+CgoJLy8gc2V0IHRoZSBzdWJyb3V0aW5lIHJldHVybiB2YWx1ZQoJZnJhbWVfYnVyeSAwCgoJLy8gcG9wIGFsbCBsb2NhbCB2YXJpYWJsZXMgZnJvbSB0aGUgc3RhY2sKCXBvcG4gMQoJcmV0c3ViCgphYmlfcm91dGVfY3JlYXRlQXBwbGljYXRpb246CglpbnQgMQoJcmV0dXJuCgpjcmVhdGVfTm9PcDoKCW1ldGhvZCAiY3JlYXRlQXBwbGljYXRpb24oKXZvaWQiCgl0eG5hIEFwcGxpY2F0aW9uQXJncyAwCgltYXRjaCBhYmlfcm91dGVfY3JlYXRlQXBwbGljYXRpb24KCWVycgoKY2FsbF9PcHRJbjoKCW1ldGhvZCAic3RhdGljQXJyYXlJblN0b3JhZ2VNYXAoKXVpbnQ2NFszXSIKCXR4bmEgQXBwbGljYXRpb25BcmdzIDAKCW1hdGNoIGFiaV9yb3V0ZV9zdGF0aWNBcnJheUluU3RvcmFnZU1hcAoJZXJy",
     "clear": "I3ByYWdtYSB2ZXJzaW9uIDk="
   },
   "contract": {
diff --git a/tests/contracts/artifacts/ABITestStaticArrayInStorageRef.approval.teal b/tests/contracts/artifacts/ABITestStaticArrayInStorageRef.approval.teal
index eea3a4b6a..9623ed7de 100644
--- a/tests/contracts/artifacts/ABITestStaticArrayInStorageRef.approval.teal
+++ b/tests/contracts/artifacts/ABITestStaticArrayInStorageRef.approval.teal
@@ -79,9 +79,9 @@ staticArrayInStorageRef:
 	itob
 	concat
 	byte 0x62526566 // "bRef"
-	box_get
-	assert
-	extract 8 8
+	int 8
+	dup
+	box_extract
 	btoi
 	itob
 	concat
diff --git a/tests/contracts/artifacts/ABITestStaticArrayInStorageRef.arc32.json b/tests/contracts/artifacts/ABITestStaticArrayInStorageRef.arc32.json
index d94ebd1b8..24c30036c 100644
--- a/tests/contracts/artifacts/ABITestStaticArrayInStorageRef.arc32.json
+++ b/tests/contracts/artifacts/ABITestStaticArrayInStorageRef.arc32.json
@@ -49,7 +49,7 @@
     }
   },
   "source": {
-    "approval": "I3ByYWdtYSB2ZXJzaW9uIDkKCi8vIFRoaXMgVEVBTCB3YXMgZ2VuZXJhdGVkIGJ5IFRFQUxTY3JpcHQgdjAuNzQuMAovLyBodHRwczovL2dpdGh1Yi5jb20vYWxnb3JhbmRmb3VuZGF0aW9uL1RFQUxTY3JpcHQKCi8vIFRoaXMgY29udHJhY3QgaXMgY29tcGxpYW50IHdpdGggYW5kL29yIGltcGxlbWVudHMgdGhlIGZvbGxvd2luZyBBUkNzOiBbIEFSQzQgXQoKLy8gVGhlIGZvbGxvd2luZyB0ZW4gbGluZXMgb2YgVEVBTCBoYW5kbGUgaW5pdGlhbCBwcm9ncmFtIGZsb3cKLy8gVGhpcyBwYXR0ZXJuIGlzIHVzZWQgdG8gbWFrZSBpdCBlYXN5IGZvciBhbnlvbmUgdG8gcGFyc2UgdGhlIHN0YXJ0IG9mIHRoZSBwcm9ncmFtIGFuZCBkZXRlcm1pbmUgaWYgYSBzcGVjaWZpYyBhY3Rpb24gaXMgYWxsb3dlZAovLyBIZXJlLCBhY3Rpb24gcmVmZXJzIHRvIHRoZSBPbkNvbXBsZXRlIGluIGNvbWJpbmF0aW9uIHdpdGggd2hldGhlciB0aGUgYXBwIGlzIGJlaW5nIGNyZWF0ZWQgb3IgY2FsbGVkCi8vIEV2ZXJ5IHBvc3NpYmxlIGFjdGlvbiBmb3IgdGhpcyBjb250cmFjdCBpcyByZXByZXNlbnRlZCBpbiB0aGUgc3dpdGNoIHN0YXRlbWVudAovLyBJZiB0aGUgYWN0aW9uIGlzIG5vdCBpbXBsbWVudGVkIGluIHRoZSBjb250cmFjdCwgaXRzIHJlc3BlY3RpdmUgYnJhbmNoIHdpbGwgYmUgIk5PVF9JTVBMRU1FTlRFRCIgd2hpY2gganVzdCBjb250YWlucyAiZXJyIgp0eG4gQXBwbGljYXRpb25JRAohCmludCA2CioKdHhuIE9uQ29tcGxldGlvbgorCnN3aXRjaCBOT1RfSU1QTEVNRU5URUQgY2FsbF9PcHRJbiBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgY3JlYXRlX05vT3AgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRAoKTk9UX0lNUExFTUVOVEVEOgoJZXJyCgphYmlfcm91dGVfc3RhdGljQXJyYXlJblN0b3JhZ2VSZWY6CgkvLyBUaGUgQUJJIHJldHVybiBwcmVmaXgKCWJ5dGUgMHgxNTFmN2M3NQoKCS8vIGV4ZWN1dGUgc3RhdGljQXJyYXlJblN0b3JhZ2VSZWYoKXVpbnQ2NFszXQoJY2FsbHN1YiBzdGF0aWNBcnJheUluU3RvcmFnZVJlZgoJY29uY2F0Cglsb2cKCWludCAxCglyZXR1cm4KCi8vIHN0YXRpY0FycmF5SW5TdG9yYWdlUmVmKCl1aW50NjRbM10Kc3RhdGljQXJyYXlJblN0b3JhZ2VSZWY6Cglwcm90byAwIDEKCgkvLyBQdXNoIGVtcHR5IGJ5dGVzIGFmdGVyIHRoZSBmcmFtZSBwb2ludGVyIHRvIHJlc2VydmUgc3BhY2UgZm9yIGxvY2FsIHZhcmlhYmxlcwoJYnl0ZSAweAoJZHVwCgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjg3CgkvLyBhOiBTdGF0aWNBcnJheTx1aW50NjQsIDM+ID0gWzExLCAyMiwgMzNdCglieXRlIDB4MDAwMDAwMDAwMDAwMDAwYjAwMDAwMDAwMDAwMDAwMTYwMDAwMDAwMDAwMDAwMDIxCglmcmFtZV9idXJ5IDAgLy8gYTogU3RhdGljQXJyYXk8dWludDY0LCAzPgoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czo4OQoJLy8gdGhpcy5nUmVmLnZhbHVlID0gYQoJYnl0ZSAweDY3NTI2NTY2IC8vICJnUmVmIgoJZnJhbWVfZGlnIDAgLy8gYTogU3RhdGljQXJyYXk8dWludDY0LCAzPgoJYXBwX2dsb2JhbF9wdXQKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6OTAKCS8vIHRoaXMubFJlZih0aGlzLnR4bi5zZW5kZXIpLnZhbHVlID0gYQoJdHhuIFNlbmRlcgoJYnl0ZSAweDZjNTI2NTY2IC8vICJsUmVmIgoJZnJhbWVfZGlnIDAgLy8gYTogU3RhdGljQXJyYXk8dWludDY0LCAzPgoJYXBwX2xvY2FsX3B1dAoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czo5MQoJLy8gdGhpcy5iUmVmLnZhbHVlID0gYQoJYnl0ZSAweDYyNTI2NTY2IC8vICJiUmVmIgoJZnJhbWVfZGlnIDAgLy8gYTogU3RhdGljQXJyYXk8dWludDY0LCAzPgoJYm94X3B1dAoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czo5MwoJLy8gcmV0OiBTdGF0aWNBcnJheTx1aW50NjQsIDM+ID0gW3RoaXMuZ1JlZi52YWx1ZVsxXSwgdGhpcy5sUmVmKHRoaXMudHhuLnNlbmRlcikudmFsdWVbMV0sIHRoaXMuYlJlZi52YWx1ZVsxXV0KCWJ5dGUgMHg2NzUyNjU2NiAvLyAiZ1JlZiIKCWFwcF9nbG9iYWxfZ2V0CglleHRyYWN0IDggOAoJYnRvaQoJaXRvYgoJdHhuIFNlbmRlcgoJYnl0ZSAweDZjNTI2NTY2IC8vICJsUmVmIgoJYXBwX2xvY2FsX2dldAoJZXh0cmFjdCA4IDgKCWJ0b2kKCWl0b2IKCWNvbmNhdAoJYnl0ZSAweDYyNTI2NTY2IC8vICJiUmVmIgoJYm94X2dldAoJYXNzZXJ0CglleHRyYWN0IDggOAoJYnRvaQoJaXRvYgoJY29uY2F0CglmcmFtZV9idXJ5IDEgLy8gcmV0OiBTdGF0aWNBcnJheTx1aW50NjQsIDM+CgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjk1CgkvLyByZXR1cm4gcmV0OwoJZnJhbWVfZGlnIDEgLy8gcmV0OiBTdGF0aWNBcnJheTx1aW50NjQsIDM+CgoJLy8gc2V0IHRoZSBzdWJyb3V0aW5lIHJldHVybiB2YWx1ZQoJZnJhbWVfYnVyeSAwCgoJLy8gcG9wIGFsbCBsb2NhbCB2YXJpYWJsZXMgZnJvbSB0aGUgc3RhY2sKCXBvcG4gMQoJcmV0c3ViCgphYmlfcm91dGVfY3JlYXRlQXBwbGljYXRpb246CglpbnQgMQoJcmV0dXJuCgpjcmVhdGVfTm9PcDoKCW1ldGhvZCAiY3JlYXRlQXBwbGljYXRpb24oKXZvaWQiCgl0eG5hIEFwcGxpY2F0aW9uQXJncyAwCgltYXRjaCBhYmlfcm91dGVfY3JlYXRlQXBwbGljYXRpb24KCWVycgoKY2FsbF9PcHRJbjoKCW1ldGhvZCAic3RhdGljQXJyYXlJblN0b3JhZ2VSZWYoKXVpbnQ2NFszXSIKCXR4bmEgQXBwbGljYXRpb25BcmdzIDAKCW1hdGNoIGFiaV9yb3V0ZV9zdGF0aWNBcnJheUluU3RvcmFnZVJlZgoJZXJy",
+    "approval": "I3ByYWdtYSB2ZXJzaW9uIDkKCi8vIFRoaXMgVEVBTCB3YXMgZ2VuZXJhdGVkIGJ5IFRFQUxTY3JpcHQgdjAuNzQuMAovLyBodHRwczovL2dpdGh1Yi5jb20vYWxnb3JhbmRmb3VuZGF0aW9uL1RFQUxTY3JpcHQKCi8vIFRoaXMgY29udHJhY3QgaXMgY29tcGxpYW50IHdpdGggYW5kL29yIGltcGxlbWVudHMgdGhlIGZvbGxvd2luZyBBUkNzOiBbIEFSQzQgXQoKLy8gVGhlIGZvbGxvd2luZyB0ZW4gbGluZXMgb2YgVEVBTCBoYW5kbGUgaW5pdGlhbCBwcm9ncmFtIGZsb3cKLy8gVGhpcyBwYXR0ZXJuIGlzIHVzZWQgdG8gbWFrZSBpdCBlYXN5IGZvciBhbnlvbmUgdG8gcGFyc2UgdGhlIHN0YXJ0IG9mIHRoZSBwcm9ncmFtIGFuZCBkZXRlcm1pbmUgaWYgYSBzcGVjaWZpYyBhY3Rpb24gaXMgYWxsb3dlZAovLyBIZXJlLCBhY3Rpb24gcmVmZXJzIHRvIHRoZSBPbkNvbXBsZXRlIGluIGNvbWJpbmF0aW9uIHdpdGggd2hldGhlciB0aGUgYXBwIGlzIGJlaW5nIGNyZWF0ZWQgb3IgY2FsbGVkCi8vIEV2ZXJ5IHBvc3NpYmxlIGFjdGlvbiBmb3IgdGhpcyBjb250cmFjdCBpcyByZXByZXNlbnRlZCBpbiB0aGUgc3dpdGNoIHN0YXRlbWVudAovLyBJZiB0aGUgYWN0aW9uIGlzIG5vdCBpbXBsbWVudGVkIGluIHRoZSBjb250cmFjdCwgaXRzIHJlc3BlY3RpdmUgYnJhbmNoIHdpbGwgYmUgIk5PVF9JTVBMRU1FTlRFRCIgd2hpY2gganVzdCBjb250YWlucyAiZXJyIgp0eG4gQXBwbGljYXRpb25JRAohCmludCA2CioKdHhuIE9uQ29tcGxldGlvbgorCnN3aXRjaCBOT1RfSU1QTEVNRU5URUQgY2FsbF9PcHRJbiBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgY3JlYXRlX05vT3AgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRAoKTk9UX0lNUExFTUVOVEVEOgoJZXJyCgphYmlfcm91dGVfc3RhdGljQXJyYXlJblN0b3JhZ2VSZWY6CgkvLyBUaGUgQUJJIHJldHVybiBwcmVmaXgKCWJ5dGUgMHgxNTFmN2M3NQoKCS8vIGV4ZWN1dGUgc3RhdGljQXJyYXlJblN0b3JhZ2VSZWYoKXVpbnQ2NFszXQoJY2FsbHN1YiBzdGF0aWNBcnJheUluU3RvcmFnZVJlZgoJY29uY2F0Cglsb2cKCWludCAxCglyZXR1cm4KCi8vIHN0YXRpY0FycmF5SW5TdG9yYWdlUmVmKCl1aW50NjRbM10Kc3RhdGljQXJyYXlJblN0b3JhZ2VSZWY6Cglwcm90byAwIDEKCgkvLyBQdXNoIGVtcHR5IGJ5dGVzIGFmdGVyIHRoZSBmcmFtZSBwb2ludGVyIHRvIHJlc2VydmUgc3BhY2UgZm9yIGxvY2FsIHZhcmlhYmxlcwoJYnl0ZSAweAoJZHVwCgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjg3CgkvLyBhOiBTdGF0aWNBcnJheTx1aW50NjQsIDM+ID0gWzExLCAyMiwgMzNdCglieXRlIDB4MDAwMDAwMDAwMDAwMDAwYjAwMDAwMDAwMDAwMDAwMTYwMDAwMDAwMDAwMDAwMDIxCglmcmFtZV9idXJ5IDAgLy8gYTogU3RhdGljQXJyYXk8dWludDY0LCAzPgoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czo4OQoJLy8gdGhpcy5nUmVmLnZhbHVlID0gYQoJYnl0ZSAweDY3NTI2NTY2IC8vICJnUmVmIgoJZnJhbWVfZGlnIDAgLy8gYTogU3RhdGljQXJyYXk8dWludDY0LCAzPgoJYXBwX2dsb2JhbF9wdXQKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6OTAKCS8vIHRoaXMubFJlZih0aGlzLnR4bi5zZW5kZXIpLnZhbHVlID0gYQoJdHhuIFNlbmRlcgoJYnl0ZSAweDZjNTI2NTY2IC8vICJsUmVmIgoJZnJhbWVfZGlnIDAgLy8gYTogU3RhdGljQXJyYXk8dWludDY0LCAzPgoJYXBwX2xvY2FsX3B1dAoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czo5MQoJLy8gdGhpcy5iUmVmLnZhbHVlID0gYQoJYnl0ZSAweDYyNTI2NTY2IC8vICJiUmVmIgoJZnJhbWVfZGlnIDAgLy8gYTogU3RhdGljQXJyYXk8dWludDY0LCAzPgoJYm94X3B1dAoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czo5MwoJLy8gcmV0OiBTdGF0aWNBcnJheTx1aW50NjQsIDM+ID0gW3RoaXMuZ1JlZi52YWx1ZVsxXSwgdGhpcy5sUmVmKHRoaXMudHhuLnNlbmRlcikudmFsdWVbMV0sIHRoaXMuYlJlZi52YWx1ZVsxXV0KCWJ5dGUgMHg2NzUyNjU2NiAvLyAiZ1JlZiIKCWFwcF9nbG9iYWxfZ2V0CglleHRyYWN0IDggOAoJYnRvaQoJaXRvYgoJdHhuIFNlbmRlcgoJYnl0ZSAweDZjNTI2NTY2IC8vICJsUmVmIgoJYXBwX2xvY2FsX2dldAoJZXh0cmFjdCA4IDgKCWJ0b2kKCWl0b2IKCWNvbmNhdAoJYnl0ZSAweDYyNTI2NTY2IC8vICJiUmVmIgoJaW50IDgKCWR1cAoJYm94X2V4dHJhY3QKCWJ0b2kKCWl0b2IKCWNvbmNhdAoJZnJhbWVfYnVyeSAxIC8vIHJldDogU3RhdGljQXJyYXk8dWludDY0LCAzPgoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czo5NQoJLy8gcmV0dXJuIHJldDsKCWZyYW1lX2RpZyAxIC8vIHJldDogU3RhdGljQXJyYXk8dWludDY0LCAzPgoKCS8vIHNldCB0aGUgc3Vicm91dGluZSByZXR1cm4gdmFsdWUKCWZyYW1lX2J1cnkgMAoKCS8vIHBvcCBhbGwgbG9jYWwgdmFyaWFibGVzIGZyb20gdGhlIHN0YWNrCglwb3BuIDEKCXJldHN1YgoKYWJpX3JvdXRlX2NyZWF0ZUFwcGxpY2F0aW9uOgoJaW50IDEKCXJldHVybgoKY3JlYXRlX05vT3A6CgltZXRob2QgImNyZWF0ZUFwcGxpY2F0aW9uKCl2b2lkIgoJdHhuYSBBcHBsaWNhdGlvbkFyZ3MgMAoJbWF0Y2ggYWJpX3JvdXRlX2NyZWF0ZUFwcGxpY2F0aW9uCgllcnIKCmNhbGxfT3B0SW46CgltZXRob2QgInN0YXRpY0FycmF5SW5TdG9yYWdlUmVmKCl1aW50NjRbM10iCgl0eG5hIEFwcGxpY2F0aW9uQXJncyAwCgltYXRjaCBhYmlfcm91dGVfc3RhdGljQXJyYXlJblN0b3JhZ2VSZWYKCWVycg==",
     "clear": "I3ByYWdtYSB2ZXJzaW9uIDk="
   },
   "contract": {
diff --git a/tests/contracts/artifacts/ABITestStorageRefAccount.approval.teal b/tests/contracts/artifacts/ABITestStorageRefAccount.approval.teal
index fbd1eccf2..63d544c20 100644
--- a/tests/contracts/artifacts/ABITestStorageRefAccount.approval.teal
+++ b/tests/contracts/artifacts/ABITestStorageRefAccount.approval.teal
@@ -71,9 +71,8 @@ storageRefAccount:
 	extract 2 0
 	store 255 // full array
 	load 255 // full array
-	int 8
 	byte 0x0000000000000004
-	replace3
+	replace2 8
 	frame_dig 1 // storage account//r
 	byte 0x0000000000000000
 	uncover 2
diff --git a/tests/contracts/artifacts/ABITestStorageRefAccount.arc32.json b/tests/contracts/artifacts/ABITestStorageRefAccount.arc32.json
index d962998be..a77e489b3 100644
--- a/tests/contracts/artifacts/ABITestStorageRefAccount.arc32.json
+++ b/tests/contracts/artifacts/ABITestStorageRefAccount.arc32.json
@@ -39,7 +39,7 @@
     }
   },
   "source": {
-    "approval": "I3ByYWdtYSB2ZXJzaW9uIDkKCi8vIFRoaXMgVEVBTCB3YXMgZ2VuZXJhdGVkIGJ5IFRFQUxTY3JpcHQgdjAuNzQuMAovLyBodHRwczovL2dpdGh1Yi5jb20vYWxnb3JhbmRmb3VuZGF0aW9uL1RFQUxTY3JpcHQKCi8vIFRoaXMgY29udHJhY3QgaXMgY29tcGxpYW50IHdpdGggYW5kL29yIGltcGxlbWVudHMgdGhlIGZvbGxvd2luZyBBUkNzOiBbIEFSQzQgXQoKLy8gVGhlIGZvbGxvd2luZyB0ZW4gbGluZXMgb2YgVEVBTCBoYW5kbGUgaW5pdGlhbCBwcm9ncmFtIGZsb3cKLy8gVGhpcyBwYXR0ZXJuIGlzIHVzZWQgdG8gbWFrZSBpdCBlYXN5IGZvciBhbnlvbmUgdG8gcGFyc2UgdGhlIHN0YXJ0IG9mIHRoZSBwcm9ncmFtIGFuZCBkZXRlcm1pbmUgaWYgYSBzcGVjaWZpYyBhY3Rpb24gaXMgYWxsb3dlZAovLyBIZXJlLCBhY3Rpb24gcmVmZXJzIHRvIHRoZSBPbkNvbXBsZXRlIGluIGNvbWJpbmF0aW9uIHdpdGggd2hldGhlciB0aGUgYXBwIGlzIGJlaW5nIGNyZWF0ZWQgb3IgY2FsbGVkCi8vIEV2ZXJ5IHBvc3NpYmxlIGFjdGlvbiBmb3IgdGhpcyBjb250cmFjdCBpcyByZXByZXNlbnRlZCBpbiB0aGUgc3dpdGNoIHN0YXRlbWVudAovLyBJZiB0aGUgYWN0aW9uIGlzIG5vdCBpbXBsbWVudGVkIGluIHRoZSBjb250cmFjdCwgaXRzIHJlc3BlY3RpdmUgYnJhbmNoIHdpbGwgYmUgIk5PVF9JTVBMRU1FTlRFRCIgd2hpY2gganVzdCBjb250YWlucyAiZXJyIgp0eG4gQXBwbGljYXRpb25JRAohCmludCA2CioKdHhuIE9uQ29tcGxldGlvbgorCnN3aXRjaCBOT1RfSU1QTEVNRU5URUQgY2FsbF9PcHRJbiBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgY3JlYXRlX05vT3AgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRAoKTk9UX0lNUExFTUVOVEVEOgoJZXJyCgphYmlfcm91dGVfc3RvcmFnZVJlZkFjY291bnQ6CgkvLyBUaGUgQUJJIHJldHVybiBwcmVmaXgKCWJ5dGUgMHgxNTFmN2M3NQoKCS8vIGV4ZWN1dGUgc3RvcmFnZVJlZkFjY291bnQoKXVpbnQ2NAoJY2FsbHN1YiBzdG9yYWdlUmVmQWNjb3VudAoJaXRvYgoJY29uY2F0Cglsb2cKCWludCAxCglyZXR1cm4KCi8vIHN0b3JhZ2VSZWZBY2NvdW50KCl1aW50NjQKc3RvcmFnZVJlZkFjY291bnQ6Cglwcm90byAwIDEKCgkvLyBQdXNoIGVtcHR5IGJ5dGVzIGFmdGVyIHRoZSBmcmFtZSBwb2ludGVyIHRvIHJlc2VydmUgc3BhY2UgZm9yIGxvY2FsIHZhcmlhYmxlcwoJYnl0ZSAweAoJZHVwCgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjEwMjgKCS8vIGFkZHIgPSB0aGlzLnR4bi5zZW5kZXIKCXR4biBTZW5kZXIKCWZyYW1lX2J1cnkgMCAvLyBhZGRyOiBhZGRyZXNzCgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjEwMjkKCS8vIHRoaXMubE1hcChhZGRyLCAwKS52YWx1ZSA9IFsxLCAyLCAzXQoJZnJhbWVfZGlnIDAgLy8gYWRkcjogYWRkcmVzcwoJYnl0ZSAweDAwMDAwMDAwMDAwMDAwMDAKCWJ5dGUgMHgwMDAzMDAwMDAwMDAwMDAwMDAwMTAwMDAwMDAwMDAwMDAwMDIwMDAwMDAwMDAwMDAwMDAzCglhcHBfbG9jYWxfcHV0CgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjEwMzAKCS8vIHIgPSB0aGlzLmxNYXAoYWRkciwgMCkudmFsdWUKCWZyYW1lX2RpZyAwIC8vIGFkZHI6IGFkZHJlc3MKCWZyYW1lX2J1cnkgMSAvLyBzdG9yYWdlIGFjY291bnQvL3IKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTAzMgoJLy8gYWRkciA9IGdsb2JhbHMuemVyb0FkZHJlc3MKCWdsb2JhbCBaZXJvQWRkcmVzcwoJZnJhbWVfYnVyeSAwIC8vIGFkZHI6IGFkZHJlc3MKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTAzNAoJLy8gclsxXSA9IDQKCWZyYW1lX2RpZyAxIC8vIHN0b3JhZ2UgYWNjb3VudC8vcgoJYnl0ZSAweDAwMDAwMDAwMDAwMDAwMDAKCWFwcF9sb2NhbF9nZXQKCWV4dHJhY3QgMiAwCglzdG9yZSAyNTUgLy8gZnVsbCBhcnJheQoJbG9hZCAyNTUgLy8gZnVsbCBhcnJheQoJaW50IDgKCWJ5dGUgMHgwMDAwMDAwMDAwMDAwMDA0CglyZXBsYWNlMwoJZnJhbWVfZGlnIDEgLy8gc3RvcmFnZSBhY2NvdW50Ly9yCglieXRlIDB4MDAwMDAwMDAwMDAwMDAwMAoJdW5jb3ZlciAyCglkdXAKCWxlbgoJaW50IDgKCS8KCWl0b2IKCWV4dHJhY3QgNiAyCglzd2FwCgljb25jYXQKCWFwcF9sb2NhbF9wdXQKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTAzNgoJLy8gcmV0dXJuIHRoaXMubE1hcCh0aGlzLnR4bi5zZW5kZXIsIDApLnZhbHVlWzFdOwoJdHhuIFNlbmRlcgoJYnl0ZSAweDAwMDAwMDAwMDAwMDAwMDAKCWFwcF9sb2NhbF9nZXQKCWV4dHJhY3QgMiAwCglzdG9yZSAyNTUgLy8gZnVsbCBhcnJheQoJbG9hZCAyNTUgLy8gZnVsbCBhcnJheQoJZXh0cmFjdCA4IDgKCWJ0b2kKCgkvLyBzZXQgdGhlIHN1YnJvdXRpbmUgcmV0dXJuIHZhbHVlCglmcmFtZV9idXJ5IDAKCgkvLyBwb3AgYWxsIGxvY2FsIHZhcmlhYmxlcyBmcm9tIHRoZSBzdGFjawoJcG9wbiAxCglyZXRzdWIKCmFiaV9yb3V0ZV9jcmVhdGVBcHBsaWNhdGlvbjoKCWludCAxCglyZXR1cm4KCmNyZWF0ZV9Ob09wOgoJbWV0aG9kICJjcmVhdGVBcHBsaWNhdGlvbigpdm9pZCIKCXR4bmEgQXBwbGljYXRpb25BcmdzIDAKCW1hdGNoIGFiaV9yb3V0ZV9jcmVhdGVBcHBsaWNhdGlvbgoJZXJyCgpjYWxsX09wdEluOgoJbWV0aG9kICJzdG9yYWdlUmVmQWNjb3VudCgpdWludDY0IgoJdHhuYSBBcHBsaWNhdGlvbkFyZ3MgMAoJbWF0Y2ggYWJpX3JvdXRlX3N0b3JhZ2VSZWZBY2NvdW50CgllcnI=",
+    "approval": "I3ByYWdtYSB2ZXJzaW9uIDkKCi8vIFRoaXMgVEVBTCB3YXMgZ2VuZXJhdGVkIGJ5IFRFQUxTY3JpcHQgdjAuNzQuMAovLyBodHRwczovL2dpdGh1Yi5jb20vYWxnb3JhbmRmb3VuZGF0aW9uL1RFQUxTY3JpcHQKCi8vIFRoaXMgY29udHJhY3QgaXMgY29tcGxpYW50IHdpdGggYW5kL29yIGltcGxlbWVudHMgdGhlIGZvbGxvd2luZyBBUkNzOiBbIEFSQzQgXQoKLy8gVGhlIGZvbGxvd2luZyB0ZW4gbGluZXMgb2YgVEVBTCBoYW5kbGUgaW5pdGlhbCBwcm9ncmFtIGZsb3cKLy8gVGhpcyBwYXR0ZXJuIGlzIHVzZWQgdG8gbWFrZSBpdCBlYXN5IGZvciBhbnlvbmUgdG8gcGFyc2UgdGhlIHN0YXJ0IG9mIHRoZSBwcm9ncmFtIGFuZCBkZXRlcm1pbmUgaWYgYSBzcGVjaWZpYyBhY3Rpb24gaXMgYWxsb3dlZAovLyBIZXJlLCBhY3Rpb24gcmVmZXJzIHRvIHRoZSBPbkNvbXBsZXRlIGluIGNvbWJpbmF0aW9uIHdpdGggd2hldGhlciB0aGUgYXBwIGlzIGJlaW5nIGNyZWF0ZWQgb3IgY2FsbGVkCi8vIEV2ZXJ5IHBvc3NpYmxlIGFjdGlvbiBmb3IgdGhpcyBjb250cmFjdCBpcyByZXByZXNlbnRlZCBpbiB0aGUgc3dpdGNoIHN0YXRlbWVudAovLyBJZiB0aGUgYWN0aW9uIGlzIG5vdCBpbXBsbWVudGVkIGluIHRoZSBjb250cmFjdCwgaXRzIHJlc3BlY3RpdmUgYnJhbmNoIHdpbGwgYmUgIk5PVF9JTVBMRU1FTlRFRCIgd2hpY2gganVzdCBjb250YWlucyAiZXJyIgp0eG4gQXBwbGljYXRpb25JRAohCmludCA2CioKdHhuIE9uQ29tcGxldGlvbgorCnN3aXRjaCBOT1RfSU1QTEVNRU5URUQgY2FsbF9PcHRJbiBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgY3JlYXRlX05vT3AgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRAoKTk9UX0lNUExFTUVOVEVEOgoJZXJyCgphYmlfcm91dGVfc3RvcmFnZVJlZkFjY291bnQ6CgkvLyBUaGUgQUJJIHJldHVybiBwcmVmaXgKCWJ5dGUgMHgxNTFmN2M3NQoKCS8vIGV4ZWN1dGUgc3RvcmFnZVJlZkFjY291bnQoKXVpbnQ2NAoJY2FsbHN1YiBzdG9yYWdlUmVmQWNjb3VudAoJaXRvYgoJY29uY2F0Cglsb2cKCWludCAxCglyZXR1cm4KCi8vIHN0b3JhZ2VSZWZBY2NvdW50KCl1aW50NjQKc3RvcmFnZVJlZkFjY291bnQ6Cglwcm90byAwIDEKCgkvLyBQdXNoIGVtcHR5IGJ5dGVzIGFmdGVyIHRoZSBmcmFtZSBwb2ludGVyIHRvIHJlc2VydmUgc3BhY2UgZm9yIGxvY2FsIHZhcmlhYmxlcwoJYnl0ZSAweAoJZHVwCgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjEwMjgKCS8vIGFkZHIgPSB0aGlzLnR4bi5zZW5kZXIKCXR4biBTZW5kZXIKCWZyYW1lX2J1cnkgMCAvLyBhZGRyOiBhZGRyZXNzCgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjEwMjkKCS8vIHRoaXMubE1hcChhZGRyLCAwKS52YWx1ZSA9IFsxLCAyLCAzXQoJZnJhbWVfZGlnIDAgLy8gYWRkcjogYWRkcmVzcwoJYnl0ZSAweDAwMDAwMDAwMDAwMDAwMDAKCWJ5dGUgMHgwMDAzMDAwMDAwMDAwMDAwMDAwMTAwMDAwMDAwMDAwMDAwMDIwMDAwMDAwMDAwMDAwMDAzCglhcHBfbG9jYWxfcHV0CgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjEwMzAKCS8vIHIgPSB0aGlzLmxNYXAoYWRkciwgMCkudmFsdWUKCWZyYW1lX2RpZyAwIC8vIGFkZHI6IGFkZHJlc3MKCWZyYW1lX2J1cnkgMSAvLyBzdG9yYWdlIGFjY291bnQvL3IKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTAzMgoJLy8gYWRkciA9IGdsb2JhbHMuemVyb0FkZHJlc3MKCWdsb2JhbCBaZXJvQWRkcmVzcwoJZnJhbWVfYnVyeSAwIC8vIGFkZHI6IGFkZHJlc3MKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTAzNAoJLy8gclsxXSA9IDQKCWZyYW1lX2RpZyAxIC8vIHN0b3JhZ2UgYWNjb3VudC8vcgoJYnl0ZSAweDAwMDAwMDAwMDAwMDAwMDAKCWFwcF9sb2NhbF9nZXQKCWV4dHJhY3QgMiAwCglzdG9yZSAyNTUgLy8gZnVsbCBhcnJheQoJbG9hZCAyNTUgLy8gZnVsbCBhcnJheQoJYnl0ZSAweDAwMDAwMDAwMDAwMDAwMDQKCXJlcGxhY2UyIDgKCWZyYW1lX2RpZyAxIC8vIHN0b3JhZ2UgYWNjb3VudC8vcgoJYnl0ZSAweDAwMDAwMDAwMDAwMDAwMDAKCXVuY292ZXIgMgoJZHVwCglsZW4KCWludCA4CgkvCglpdG9iCglleHRyYWN0IDYgMgoJc3dhcAoJY29uY2F0CglhcHBfbG9jYWxfcHV0CgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjEwMzYKCS8vIHJldHVybiB0aGlzLmxNYXAodGhpcy50eG4uc2VuZGVyLCAwKS52YWx1ZVsxXTsKCXR4biBTZW5kZXIKCWJ5dGUgMHgwMDAwMDAwMDAwMDAwMDAwCglhcHBfbG9jYWxfZ2V0CglleHRyYWN0IDIgMAoJc3RvcmUgMjU1IC8vIGZ1bGwgYXJyYXkKCWxvYWQgMjU1IC8vIGZ1bGwgYXJyYXkKCWV4dHJhY3QgOCA4CglidG9pCgoJLy8gc2V0IHRoZSBzdWJyb3V0aW5lIHJldHVybiB2YWx1ZQoJZnJhbWVfYnVyeSAwCgoJLy8gcG9wIGFsbCBsb2NhbCB2YXJpYWJsZXMgZnJvbSB0aGUgc3RhY2sKCXBvcG4gMQoJcmV0c3ViCgphYmlfcm91dGVfY3JlYXRlQXBwbGljYXRpb246CglpbnQgMQoJcmV0dXJuCgpjcmVhdGVfTm9PcDoKCW1ldGhvZCAiY3JlYXRlQXBwbGljYXRpb24oKXZvaWQiCgl0eG5hIEFwcGxpY2F0aW9uQXJncyAwCgltYXRjaCBhYmlfcm91dGVfY3JlYXRlQXBwbGljYXRpb24KCWVycgoKY2FsbF9PcHRJbjoKCW1ldGhvZCAic3RvcmFnZVJlZkFjY291bnQoKXVpbnQ2NCIKCXR4bmEgQXBwbGljYXRpb25BcmdzIDAKCW1hdGNoIGFiaV9yb3V0ZV9zdG9yYWdlUmVmQWNjb3VudAoJZXJy",
     "clear": "I3ByYWdtYSB2ZXJzaW9uIDk="
   },
   "contract": {
diff --git a/tests/contracts/artifacts/ABITestStorageRefKey.approval.teal b/tests/contracts/artifacts/ABITestStorageRefKey.approval.teal
index dac5bbfac..64fdf8fa1 100644
--- a/tests/contracts/artifacts/ABITestStorageRefKey.approval.teal
+++ b/tests/contracts/artifacts/ABITestStorageRefKey.approval.teal
@@ -70,9 +70,8 @@ storageRefKey:
 	extract 2 0
 	store 255 // full array
 	load 255 // full array
-	int 8
 	byte 0x0000000000000004
-	replace3
+	replace2 8
 	frame_dig 1 // storage key//r
 	swap
 	dup
diff --git a/tests/contracts/artifacts/ABITestStorageRefKey.arc32.json b/tests/contracts/artifacts/ABITestStorageRefKey.arc32.json
index 598a60623..c5e4af9ab 100644
--- a/tests/contracts/artifacts/ABITestStorageRefKey.arc32.json
+++ b/tests/contracts/artifacts/ABITestStorageRefKey.arc32.json
@@ -39,7 +39,7 @@
     }
   },
   "source": {
-    "approval": "I3ByYWdtYSB2ZXJzaW9uIDkKCi8vIFRoaXMgVEVBTCB3YXMgZ2VuZXJhdGVkIGJ5IFRFQUxTY3JpcHQgdjAuNzQuMAovLyBodHRwczovL2dpdGh1Yi5jb20vYWxnb3JhbmRmb3VuZGF0aW9uL1RFQUxTY3JpcHQKCi8vIFRoaXMgY29udHJhY3QgaXMgY29tcGxpYW50IHdpdGggYW5kL29yIGltcGxlbWVudHMgdGhlIGZvbGxvd2luZyBBUkNzOiBbIEFSQzQgXQoKLy8gVGhlIGZvbGxvd2luZyB0ZW4gbGluZXMgb2YgVEVBTCBoYW5kbGUgaW5pdGlhbCBwcm9ncmFtIGZsb3cKLy8gVGhpcyBwYXR0ZXJuIGlzIHVzZWQgdG8gbWFrZSBpdCBlYXN5IGZvciBhbnlvbmUgdG8gcGFyc2UgdGhlIHN0YXJ0IG9mIHRoZSBwcm9ncmFtIGFuZCBkZXRlcm1pbmUgaWYgYSBzcGVjaWZpYyBhY3Rpb24gaXMgYWxsb3dlZAovLyBIZXJlLCBhY3Rpb24gcmVmZXJzIHRvIHRoZSBPbkNvbXBsZXRlIGluIGNvbWJpbmF0aW9uIHdpdGggd2hldGhlciB0aGUgYXBwIGlzIGJlaW5nIGNyZWF0ZWQgb3IgY2FsbGVkCi8vIEV2ZXJ5IHBvc3NpYmxlIGFjdGlvbiBmb3IgdGhpcyBjb250cmFjdCBpcyByZXByZXNlbnRlZCBpbiB0aGUgc3dpdGNoIHN0YXRlbWVudAovLyBJZiB0aGUgYWN0aW9uIGlzIG5vdCBpbXBsbWVudGVkIGluIHRoZSBjb250cmFjdCwgaXRzIHJlc3BlY3RpdmUgYnJhbmNoIHdpbGwgYmUgIk5PVF9JTVBMRU1FTlRFRCIgd2hpY2gganVzdCBjb250YWlucyAiZXJyIgp0eG4gQXBwbGljYXRpb25JRAohCmludCA2CioKdHhuIE9uQ29tcGxldGlvbgorCnN3aXRjaCBjYWxsX05vT3AgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBjcmVhdGVfTm9PcCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVECgpOT1RfSU1QTEVNRU5URUQ6CgllcnIKCmFiaV9yb3V0ZV9zdG9yYWdlUmVmS2V5OgoJLy8gVGhlIEFCSSByZXR1cm4gcHJlZml4CglieXRlIDB4MTUxZjdjNzUKCgkvLyBleGVjdXRlIHN0b3JhZ2VSZWZLZXkoKXVpbnQ2NAoJY2FsbHN1YiBzdG9yYWdlUmVmS2V5CglpdG9iCgljb25jYXQKCWxvZwoJaW50IDEKCXJldHVybgoKLy8gc3RvcmFnZVJlZktleSgpdWludDY0CnN0b3JhZ2VSZWZLZXk6Cglwcm90byAwIDEKCgkvLyBQdXNoIGVtcHR5IGJ5dGVzIGFmdGVyIHRoZSBmcmFtZSBwb2ludGVyIHRvIHJlc2VydmUgc3BhY2UgZm9yIGxvY2FsIHZhcmlhYmxlcwoJYnl0ZSAweAoJZHVwCgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjEwMDkKCS8vIHRoaXMuZ01hcCgwKS52YWx1ZSA9IFsxLCAyLCAzXQoJYnl0ZSAweDAwMDAwMDAwMDAwMDAwMDAKCWJ5dGUgMHgwMDAzMDAwMDAwMDAwMDAwMDAwMTAwMDAwMDAwMDAwMDAwMDIwMDAwMDAwMDAwMDAwMDAzCglhcHBfZ2xvYmFsX3B1dAoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czoxMDExCgkvLyBpID0gMAoJaW50IDAKCWZyYW1lX2J1cnkgMCAvLyBpOiB1aW50NjQKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTAxMwoJLy8gciA9IHRoaXMuZ01hcChpKS52YWx1ZQoJZnJhbWVfZGlnIDAgLy8gaTogdWludDY0CglpdG9iCglmcmFtZV9idXJ5IDEgLy8gc3RvcmFnZSBrZXkvL3IKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTAxNQoJLy8gaSA9IDEKCWludCAxCglmcmFtZV9idXJ5IDAgLy8gaTogdWludDY0CgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjEwMTcKCS8vIHJbMV0gPSA0CglmcmFtZV9kaWcgMSAvLyBzdG9yYWdlIGtleS8vcgoJYXBwX2dsb2JhbF9nZXQKCWV4dHJhY3QgMiAwCglzdG9yZSAyNTUgLy8gZnVsbCBhcnJheQoJbG9hZCAyNTUgLy8gZnVsbCBhcnJheQoJaW50IDgKCWJ5dGUgMHgwMDAwMDAwMDAwMDAwMDA0CglyZXBsYWNlMwoJZnJhbWVfZGlnIDEgLy8gc3RvcmFnZSBrZXkvL3IKCXN3YXAKCWR1cAoJbGVuCglpbnQgOAoJLwoJaXRvYgoJZXh0cmFjdCA2IDIKCXN3YXAKCWNvbmNhdAoJYXBwX2dsb2JhbF9wdXQKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTAxOQoJLy8gcmV0dXJuIHRoaXMuZ01hcCgwKS52YWx1ZVsxXTsKCWJ5dGUgMHgwMDAwMDAwMDAwMDAwMDAwCglhcHBfZ2xvYmFsX2dldAoJZXh0cmFjdCAyIDAKCXN0b3JlIDI1NSAvLyBmdWxsIGFycmF5Cglsb2FkIDI1NSAvLyBmdWxsIGFycmF5CglleHRyYWN0IDggOAoJYnRvaQoKCS8vIHNldCB0aGUgc3Vicm91dGluZSByZXR1cm4gdmFsdWUKCWZyYW1lX2J1cnkgMAoKCS8vIHBvcCBhbGwgbG9jYWwgdmFyaWFibGVzIGZyb20gdGhlIHN0YWNrCglwb3BuIDEKCXJldHN1YgoKYWJpX3JvdXRlX2NyZWF0ZUFwcGxpY2F0aW9uOgoJaW50IDEKCXJldHVybgoKY3JlYXRlX05vT3A6CgltZXRob2QgImNyZWF0ZUFwcGxpY2F0aW9uKCl2b2lkIgoJdHhuYSBBcHBsaWNhdGlvbkFyZ3MgMAoJbWF0Y2ggYWJpX3JvdXRlX2NyZWF0ZUFwcGxpY2F0aW9uCgllcnIKCmNhbGxfTm9PcDoKCW1ldGhvZCAic3RvcmFnZVJlZktleSgpdWludDY0IgoJdHhuYSBBcHBsaWNhdGlvbkFyZ3MgMAoJbWF0Y2ggYWJpX3JvdXRlX3N0b3JhZ2VSZWZLZXkKCWVycg==",
+    "approval": "I3ByYWdtYSB2ZXJzaW9uIDkKCi8vIFRoaXMgVEVBTCB3YXMgZ2VuZXJhdGVkIGJ5IFRFQUxTY3JpcHQgdjAuNzQuMAovLyBodHRwczovL2dpdGh1Yi5jb20vYWxnb3JhbmRmb3VuZGF0aW9uL1RFQUxTY3JpcHQKCi8vIFRoaXMgY29udHJhY3QgaXMgY29tcGxpYW50IHdpdGggYW5kL29yIGltcGxlbWVudHMgdGhlIGZvbGxvd2luZyBBUkNzOiBbIEFSQzQgXQoKLy8gVGhlIGZvbGxvd2luZyB0ZW4gbGluZXMgb2YgVEVBTCBoYW5kbGUgaW5pdGlhbCBwcm9ncmFtIGZsb3cKLy8gVGhpcyBwYXR0ZXJuIGlzIHVzZWQgdG8gbWFrZSBpdCBlYXN5IGZvciBhbnlvbmUgdG8gcGFyc2UgdGhlIHN0YXJ0IG9mIHRoZSBwcm9ncmFtIGFuZCBkZXRlcm1pbmUgaWYgYSBzcGVjaWZpYyBhY3Rpb24gaXMgYWxsb3dlZAovLyBIZXJlLCBhY3Rpb24gcmVmZXJzIHRvIHRoZSBPbkNvbXBsZXRlIGluIGNvbWJpbmF0aW9uIHdpdGggd2hldGhlciB0aGUgYXBwIGlzIGJlaW5nIGNyZWF0ZWQgb3IgY2FsbGVkCi8vIEV2ZXJ5IHBvc3NpYmxlIGFjdGlvbiBmb3IgdGhpcyBjb250cmFjdCBpcyByZXByZXNlbnRlZCBpbiB0aGUgc3dpdGNoIHN0YXRlbWVudAovLyBJZiB0aGUgYWN0aW9uIGlzIG5vdCBpbXBsbWVudGVkIGluIHRoZSBjb250cmFjdCwgaXRzIHJlc3BlY3RpdmUgYnJhbmNoIHdpbGwgYmUgIk5PVF9JTVBMRU1FTlRFRCIgd2hpY2gganVzdCBjb250YWlucyAiZXJyIgp0eG4gQXBwbGljYXRpb25JRAohCmludCA2CioKdHhuIE9uQ29tcGxldGlvbgorCnN3aXRjaCBjYWxsX05vT3AgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBjcmVhdGVfTm9PcCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVECgpOT1RfSU1QTEVNRU5URUQ6CgllcnIKCmFiaV9yb3V0ZV9zdG9yYWdlUmVmS2V5OgoJLy8gVGhlIEFCSSByZXR1cm4gcHJlZml4CglieXRlIDB4MTUxZjdjNzUKCgkvLyBleGVjdXRlIHN0b3JhZ2VSZWZLZXkoKXVpbnQ2NAoJY2FsbHN1YiBzdG9yYWdlUmVmS2V5CglpdG9iCgljb25jYXQKCWxvZwoJaW50IDEKCXJldHVybgoKLy8gc3RvcmFnZVJlZktleSgpdWludDY0CnN0b3JhZ2VSZWZLZXk6Cglwcm90byAwIDEKCgkvLyBQdXNoIGVtcHR5IGJ5dGVzIGFmdGVyIHRoZSBmcmFtZSBwb2ludGVyIHRvIHJlc2VydmUgc3BhY2UgZm9yIGxvY2FsIHZhcmlhYmxlcwoJYnl0ZSAweAoJZHVwCgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjEwMDkKCS8vIHRoaXMuZ01hcCgwKS52YWx1ZSA9IFsxLCAyLCAzXQoJYnl0ZSAweDAwMDAwMDAwMDAwMDAwMDAKCWJ5dGUgMHgwMDAzMDAwMDAwMDAwMDAwMDAwMTAwMDAwMDAwMDAwMDAwMDIwMDAwMDAwMDAwMDAwMDAzCglhcHBfZ2xvYmFsX3B1dAoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czoxMDExCgkvLyBpID0gMAoJaW50IDAKCWZyYW1lX2J1cnkgMCAvLyBpOiB1aW50NjQKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTAxMwoJLy8gciA9IHRoaXMuZ01hcChpKS52YWx1ZQoJZnJhbWVfZGlnIDAgLy8gaTogdWludDY0CglpdG9iCglmcmFtZV9idXJ5IDEgLy8gc3RvcmFnZSBrZXkvL3IKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTAxNQoJLy8gaSA9IDEKCWludCAxCglmcmFtZV9idXJ5IDAgLy8gaTogdWludDY0CgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjEwMTcKCS8vIHJbMV0gPSA0CglmcmFtZV9kaWcgMSAvLyBzdG9yYWdlIGtleS8vcgoJYXBwX2dsb2JhbF9nZXQKCWV4dHJhY3QgMiAwCglzdG9yZSAyNTUgLy8gZnVsbCBhcnJheQoJbG9hZCAyNTUgLy8gZnVsbCBhcnJheQoJYnl0ZSAweDAwMDAwMDAwMDAwMDAwMDQKCXJlcGxhY2UyIDgKCWZyYW1lX2RpZyAxIC8vIHN0b3JhZ2Uga2V5Ly9yCglzd2FwCglkdXAKCWxlbgoJaW50IDgKCS8KCWl0b2IKCWV4dHJhY3QgNiAyCglzd2FwCgljb25jYXQKCWFwcF9nbG9iYWxfcHV0CgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjEwMTkKCS8vIHJldHVybiB0aGlzLmdNYXAoMCkudmFsdWVbMV07CglieXRlIDB4MDAwMDAwMDAwMDAwMDAwMAoJYXBwX2dsb2JhbF9nZXQKCWV4dHJhY3QgMiAwCglzdG9yZSAyNTUgLy8gZnVsbCBhcnJheQoJbG9hZCAyNTUgLy8gZnVsbCBhcnJheQoJZXh0cmFjdCA4IDgKCWJ0b2kKCgkvLyBzZXQgdGhlIHN1YnJvdXRpbmUgcmV0dXJuIHZhbHVlCglmcmFtZV9idXJ5IDAKCgkvLyBwb3AgYWxsIGxvY2FsIHZhcmlhYmxlcyBmcm9tIHRoZSBzdGFjawoJcG9wbiAxCglyZXRzdWIKCmFiaV9yb3V0ZV9jcmVhdGVBcHBsaWNhdGlvbjoKCWludCAxCglyZXR1cm4KCmNyZWF0ZV9Ob09wOgoJbWV0aG9kICJjcmVhdGVBcHBsaWNhdGlvbigpdm9pZCIKCXR4bmEgQXBwbGljYXRpb25BcmdzIDAKCW1hdGNoIGFiaV9yb3V0ZV9jcmVhdGVBcHBsaWNhdGlvbgoJZXJyCgpjYWxsX05vT3A6CgltZXRob2QgInN0b3JhZ2VSZWZLZXkoKXVpbnQ2NCIKCXR4bmEgQXBwbGljYXRpb25BcmdzIDAKCW1hdGNoIGFiaV9yb3V0ZV9zdG9yYWdlUmVmS2V5CgllcnI=",
     "clear": "I3ByYWdtYSB2ZXJzaW9uIDk="
   },
   "contract": {
diff --git a/tests/contracts/artifacts/ABITestUpdateArrayRefInBoxStorage.approval.teal b/tests/contracts/artifacts/ABITestUpdateArrayRefInBoxStorage.approval.teal
index ba58ab9d7..50441559b 100644
--- a/tests/contracts/artifacts/ABITestUpdateArrayRefInBoxStorage.approval.teal
+++ b/tests/contracts/artifacts/ABITestUpdateArrayRefInBoxStorage.approval.teal
@@ -53,13 +53,9 @@ updateArrayRefInBoxStorage:
 	// tests/contracts/abi.algo.ts:1120
 	// v[0] = 3
 	frame_dig 0 // storage key//v
-	box_get
-	assert
+	int 0
 	byte 0x03
-	replace2 0
-	frame_dig 0 // storage key//v
-	swap
-	box_put
+	box_replace
 
 	// tests/contracts/abi.algo.ts:1122
 	// return v;
diff --git a/tests/contracts/artifacts/ABITestUpdateArrayRefInBoxStorage.arc32.json b/tests/contracts/artifacts/ABITestUpdateArrayRefInBoxStorage.arc32.json
index 8942e08ed..838824f1f 100644
--- a/tests/contracts/artifacts/ABITestUpdateArrayRefInBoxStorage.arc32.json
+++ b/tests/contracts/artifacts/ABITestUpdateArrayRefInBoxStorage.arc32.json
@@ -39,7 +39,7 @@
     }
   },
   "source": {
-    "approval": "I3ByYWdtYSB2ZXJzaW9uIDkKCi8vIFRoaXMgVEVBTCB3YXMgZ2VuZXJhdGVkIGJ5IFRFQUxTY3JpcHQgdjAuNzQuMAovLyBodHRwczovL2dpdGh1Yi5jb20vYWxnb3JhbmRmb3VuZGF0aW9uL1RFQUxTY3JpcHQKCi8vIFRoaXMgY29udHJhY3QgaXMgY29tcGxpYW50IHdpdGggYW5kL29yIGltcGxlbWVudHMgdGhlIGZvbGxvd2luZyBBUkNzOiBbIEFSQzQgXQoKLy8gVGhlIGZvbGxvd2luZyB0ZW4gbGluZXMgb2YgVEVBTCBoYW5kbGUgaW5pdGlhbCBwcm9ncmFtIGZsb3cKLy8gVGhpcyBwYXR0ZXJuIGlzIHVzZWQgdG8gbWFrZSBpdCBlYXN5IGZvciBhbnlvbmUgdG8gcGFyc2UgdGhlIHN0YXJ0IG9mIHRoZSBwcm9ncmFtIGFuZCBkZXRlcm1pbmUgaWYgYSBzcGVjaWZpYyBhY3Rpb24gaXMgYWxsb3dlZAovLyBIZXJlLCBhY3Rpb24gcmVmZXJzIHRvIHRoZSBPbkNvbXBsZXRlIGluIGNvbWJpbmF0aW9uIHdpdGggd2hldGhlciB0aGUgYXBwIGlzIGJlaW5nIGNyZWF0ZWQgb3IgY2FsbGVkCi8vIEV2ZXJ5IHBvc3NpYmxlIGFjdGlvbiBmb3IgdGhpcyBjb250cmFjdCBpcyByZXByZXNlbnRlZCBpbiB0aGUgc3dpdGNoIHN0YXRlbWVudAovLyBJZiB0aGUgYWN0aW9uIGlzIG5vdCBpbXBsbWVudGVkIGluIHRoZSBjb250cmFjdCwgaXRzIHJlc3BlY3RpdmUgYnJhbmNoIHdpbGwgYmUgIk5PVF9JTVBMRU1FTlRFRCIgd2hpY2gganVzdCBjb250YWlucyAiZXJyIgp0eG4gQXBwbGljYXRpb25JRAohCmludCA2CioKdHhuIE9uQ29tcGxldGlvbgorCnN3aXRjaCBOT1RfSU1QTEVNRU5URUQgY2FsbF9PcHRJbiBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgY3JlYXRlX05vT3AgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRAoKTk9UX0lNUExFTUVOVEVEOgoJZXJyCgphYmlfcm91dGVfdXBkYXRlQXJyYXlSZWZJbkJveFN0b3JhZ2U6CgkvLyBUaGUgQUJJIHJldHVybiBwcmVmaXgKCWJ5dGUgMHgxNTFmN2M3NQoKCS8vIGV4ZWN1dGUgdXBkYXRlQXJyYXlSZWZJbkJveFN0b3JhZ2UoKSh1aW50OCx1aW50NjQpCgljYWxsc3ViIHVwZGF0ZUFycmF5UmVmSW5Cb3hTdG9yYWdlCgljb25jYXQKCWxvZwoJaW50IDEKCXJldHVybgoKLy8gdXBkYXRlQXJyYXlSZWZJbkJveFN0b3JhZ2UoKSh1aW50OCx1aW50NjQpCnVwZGF0ZUFycmF5UmVmSW5Cb3hTdG9yYWdlOgoJcHJvdG8gMCAxCgoJLy8gUHVzaCBlbXB0eSBieXRlcyBhZnRlciB0aGUgZnJhbWUgcG9pbnRlciB0byByZXNlcnZlIHNwYWNlIGZvciBsb2NhbCB2YXJpYWJsZXMKCWJ5dGUgMHgKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTExNgoJLy8gdGhpcy5iTWFwKHRoaXMudHhuLnNlbmRlcikudmFsdWUgPSBbMSwgMl0KCXR4biBTZW5kZXIKCWJ5dGUgMHgwMTAwMDAwMDAwMDAwMDAwMDIKCWJveF9wdXQKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTExOAoJLy8gdiA9IHRoaXMuYk1hcCh0aGlzLnR4bi5zZW5kZXIpLnZhbHVlCgl0eG4gU2VuZGVyCglmcmFtZV9idXJ5IDAgLy8gc3RvcmFnZSBrZXkvL3YKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTEyMAoJLy8gdlswXSA9IDMKCWZyYW1lX2RpZyAwIC8vIHN0b3JhZ2Uga2V5Ly92Cglib3hfZ2V0Cglhc3NlcnQKCWJ5dGUgMHgwMwoJcmVwbGFjZTIgMAoJZnJhbWVfZGlnIDAgLy8gc3RvcmFnZSBrZXkvL3YKCXN3YXAKCWJveF9wdXQKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTEyMgoJLy8gcmV0dXJuIHY7CglmcmFtZV9kaWcgMCAvLyBzdG9yYWdlIGtleS8vdgoJYm94X2dldAoJYXNzZXJ0CgoJLy8gc2V0IHRoZSBzdWJyb3V0aW5lIHJldHVybiB2YWx1ZQoJZnJhbWVfYnVyeSAwCglyZXRzdWIKCmFiaV9yb3V0ZV9jcmVhdGVBcHBsaWNhdGlvbjoKCWludCAxCglyZXR1cm4KCmNyZWF0ZV9Ob09wOgoJbWV0aG9kICJjcmVhdGVBcHBsaWNhdGlvbigpdm9pZCIKCXR4bmEgQXBwbGljYXRpb25BcmdzIDAKCW1hdGNoIGFiaV9yb3V0ZV9jcmVhdGVBcHBsaWNhdGlvbgoJZXJyCgpjYWxsX09wdEluOgoJbWV0aG9kICJ1cGRhdGVBcnJheVJlZkluQm94U3RvcmFnZSgpKHVpbnQ4LHVpbnQ2NCkiCgl0eG5hIEFwcGxpY2F0aW9uQXJncyAwCgltYXRjaCBhYmlfcm91dGVfdXBkYXRlQXJyYXlSZWZJbkJveFN0b3JhZ2UKCWVycg==",
+    "approval": "I3ByYWdtYSB2ZXJzaW9uIDkKCi8vIFRoaXMgVEVBTCB3YXMgZ2VuZXJhdGVkIGJ5IFRFQUxTY3JpcHQgdjAuNzQuMAovLyBodHRwczovL2dpdGh1Yi5jb20vYWxnb3JhbmRmb3VuZGF0aW9uL1RFQUxTY3JpcHQKCi8vIFRoaXMgY29udHJhY3QgaXMgY29tcGxpYW50IHdpdGggYW5kL29yIGltcGxlbWVudHMgdGhlIGZvbGxvd2luZyBBUkNzOiBbIEFSQzQgXQoKLy8gVGhlIGZvbGxvd2luZyB0ZW4gbGluZXMgb2YgVEVBTCBoYW5kbGUgaW5pdGlhbCBwcm9ncmFtIGZsb3cKLy8gVGhpcyBwYXR0ZXJuIGlzIHVzZWQgdG8gbWFrZSBpdCBlYXN5IGZvciBhbnlvbmUgdG8gcGFyc2UgdGhlIHN0YXJ0IG9mIHRoZSBwcm9ncmFtIGFuZCBkZXRlcm1pbmUgaWYgYSBzcGVjaWZpYyBhY3Rpb24gaXMgYWxsb3dlZAovLyBIZXJlLCBhY3Rpb24gcmVmZXJzIHRvIHRoZSBPbkNvbXBsZXRlIGluIGNvbWJpbmF0aW9uIHdpdGggd2hldGhlciB0aGUgYXBwIGlzIGJlaW5nIGNyZWF0ZWQgb3IgY2FsbGVkCi8vIEV2ZXJ5IHBvc3NpYmxlIGFjdGlvbiBmb3IgdGhpcyBjb250cmFjdCBpcyByZXByZXNlbnRlZCBpbiB0aGUgc3dpdGNoIHN0YXRlbWVudAovLyBJZiB0aGUgYWN0aW9uIGlzIG5vdCBpbXBsbWVudGVkIGluIHRoZSBjb250cmFjdCwgaXRzIHJlc3BlY3RpdmUgYnJhbmNoIHdpbGwgYmUgIk5PVF9JTVBMRU1FTlRFRCIgd2hpY2gganVzdCBjb250YWlucyAiZXJyIgp0eG4gQXBwbGljYXRpb25JRAohCmludCA2CioKdHhuIE9uQ29tcGxldGlvbgorCnN3aXRjaCBOT1RfSU1QTEVNRU5URUQgY2FsbF9PcHRJbiBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgY3JlYXRlX05vT3AgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRAoKTk9UX0lNUExFTUVOVEVEOgoJZXJyCgphYmlfcm91dGVfdXBkYXRlQXJyYXlSZWZJbkJveFN0b3JhZ2U6CgkvLyBUaGUgQUJJIHJldHVybiBwcmVmaXgKCWJ5dGUgMHgxNTFmN2M3NQoKCS8vIGV4ZWN1dGUgdXBkYXRlQXJyYXlSZWZJbkJveFN0b3JhZ2UoKSh1aW50OCx1aW50NjQpCgljYWxsc3ViIHVwZGF0ZUFycmF5UmVmSW5Cb3hTdG9yYWdlCgljb25jYXQKCWxvZwoJaW50IDEKCXJldHVybgoKLy8gdXBkYXRlQXJyYXlSZWZJbkJveFN0b3JhZ2UoKSh1aW50OCx1aW50NjQpCnVwZGF0ZUFycmF5UmVmSW5Cb3hTdG9yYWdlOgoJcHJvdG8gMCAxCgoJLy8gUHVzaCBlbXB0eSBieXRlcyBhZnRlciB0aGUgZnJhbWUgcG9pbnRlciB0byByZXNlcnZlIHNwYWNlIGZvciBsb2NhbCB2YXJpYWJsZXMKCWJ5dGUgMHgKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTExNgoJLy8gdGhpcy5iTWFwKHRoaXMudHhuLnNlbmRlcikudmFsdWUgPSBbMSwgMl0KCXR4biBTZW5kZXIKCWJ5dGUgMHgwMTAwMDAwMDAwMDAwMDAwMDIKCWJveF9wdXQKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTExOAoJLy8gdiA9IHRoaXMuYk1hcCh0aGlzLnR4bi5zZW5kZXIpLnZhbHVlCgl0eG4gU2VuZGVyCglmcmFtZV9idXJ5IDAgLy8gc3RvcmFnZSBrZXkvL3YKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTEyMAoJLy8gdlswXSA9IDMKCWZyYW1lX2RpZyAwIC8vIHN0b3JhZ2Uga2V5Ly92CglpbnQgMAoJYnl0ZSAweDAzCglib3hfcmVwbGFjZQoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czoxMTIyCgkvLyByZXR1cm4gdjsKCWZyYW1lX2RpZyAwIC8vIHN0b3JhZ2Uga2V5Ly92Cglib3hfZ2V0Cglhc3NlcnQKCgkvLyBzZXQgdGhlIHN1YnJvdXRpbmUgcmV0dXJuIHZhbHVlCglmcmFtZV9idXJ5IDAKCXJldHN1YgoKYWJpX3JvdXRlX2NyZWF0ZUFwcGxpY2F0aW9uOgoJaW50IDEKCXJldHVybgoKY3JlYXRlX05vT3A6CgltZXRob2QgImNyZWF0ZUFwcGxpY2F0aW9uKCl2b2lkIgoJdHhuYSBBcHBsaWNhdGlvbkFyZ3MgMAoJbWF0Y2ggYWJpX3JvdXRlX2NyZWF0ZUFwcGxpY2F0aW9uCgllcnIKCmNhbGxfT3B0SW46CgltZXRob2QgInVwZGF0ZUFycmF5UmVmSW5Cb3hTdG9yYWdlKCkodWludDgsdWludDY0KSIKCXR4bmEgQXBwbGljYXRpb25BcmdzIDAKCW1hdGNoIGFiaV9yb3V0ZV91cGRhdGVBcnJheVJlZkluQm94U3RvcmFnZQoJZXJy",
     "clear": "I3ByYWdtYSB2ZXJzaW9uIDk="
   },
   "contract": {
diff --git a/tests/contracts/artifacts/ABITestUpdateDynamicArrayElement.approval.teal b/tests/contracts/artifacts/ABITestUpdateDynamicArrayElement.approval.teal
index d344cb4a2..f299c440f 100644
--- a/tests/contracts/artifacts/ABITestUpdateDynamicArrayElement.approval.teal
+++ b/tests/contracts/artifacts/ABITestUpdateDynamicArrayElement.approval.teal
@@ -50,9 +50,8 @@ updateDynamicArrayElement:
 	frame_dig 0 // a: uint64[]
 	store 255 // full array
 	load 255 // full array
-	int 8
 	byte 0x00000000000000de
-	replace3
+	replace2 8
 	frame_bury 0 // a: uint64[]
 
 	// tests/contracts/abi.algo.ts:373
diff --git a/tests/contracts/artifacts/ABITestUpdateDynamicArrayElement.arc32.json b/tests/contracts/artifacts/ABITestUpdateDynamicArrayElement.arc32.json
index 8ed8409dd..a90b4ccb3 100644
--- a/tests/contracts/artifacts/ABITestUpdateDynamicArrayElement.arc32.json
+++ b/tests/contracts/artifacts/ABITestUpdateDynamicArrayElement.arc32.json
@@ -39,7 +39,7 @@
     }
   },
   "source": {
-    "approval": "I3ByYWdtYSB2ZXJzaW9uIDkKCi8vIFRoaXMgVEVBTCB3YXMgZ2VuZXJhdGVkIGJ5IFRFQUxTY3JpcHQgdjAuNzQuMAovLyBodHRwczovL2dpdGh1Yi5jb20vYWxnb3JhbmRmb3VuZGF0aW9uL1RFQUxTY3JpcHQKCi8vIFRoaXMgY29udHJhY3QgaXMgY29tcGxpYW50IHdpdGggYW5kL29yIGltcGxlbWVudHMgdGhlIGZvbGxvd2luZyBBUkNzOiBbIEFSQzQgXQoKLy8gVGhlIGZvbGxvd2luZyB0ZW4gbGluZXMgb2YgVEVBTCBoYW5kbGUgaW5pdGlhbCBwcm9ncmFtIGZsb3cKLy8gVGhpcyBwYXR0ZXJuIGlzIHVzZWQgdG8gbWFrZSBpdCBlYXN5IGZvciBhbnlvbmUgdG8gcGFyc2UgdGhlIHN0YXJ0IG9mIHRoZSBwcm9ncmFtIGFuZCBkZXRlcm1pbmUgaWYgYSBzcGVjaWZpYyBhY3Rpb24gaXMgYWxsb3dlZAovLyBIZXJlLCBhY3Rpb24gcmVmZXJzIHRvIHRoZSBPbkNvbXBsZXRlIGluIGNvbWJpbmF0aW9uIHdpdGggd2hldGhlciB0aGUgYXBwIGlzIGJlaW5nIGNyZWF0ZWQgb3IgY2FsbGVkCi8vIEV2ZXJ5IHBvc3NpYmxlIGFjdGlvbiBmb3IgdGhpcyBjb250cmFjdCBpcyByZXByZXNlbnRlZCBpbiB0aGUgc3dpdGNoIHN0YXRlbWVudAovLyBJZiB0aGUgYWN0aW9uIGlzIG5vdCBpbXBsbWVudGVkIGluIHRoZSBjb250cmFjdCwgaXRzIHJlc3BlY3RpdmUgYnJhbmNoIHdpbGwgYmUgIk5PVF9JTVBMRU1FTlRFRCIgd2hpY2gganVzdCBjb250YWlucyAiZXJyIgp0eG4gQXBwbGljYXRpb25JRAohCmludCA2CioKdHhuIE9uQ29tcGxldGlvbgorCnN3aXRjaCBjYWxsX05vT3AgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBjcmVhdGVfTm9PcCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVECgpOT1RfSU1QTEVNRU5URUQ6CgllcnIKCmFiaV9yb3V0ZV91cGRhdGVEeW5hbWljQXJyYXlFbGVtZW50OgoJLy8gVGhlIEFCSSByZXR1cm4gcHJlZml4CglieXRlIDB4MTUxZjdjNzUKCgkvLyBleGVjdXRlIHVwZGF0ZUR5bmFtaWNBcnJheUVsZW1lbnQoKXVpbnQ2NAoJY2FsbHN1YiB1cGRhdGVEeW5hbWljQXJyYXlFbGVtZW50CglpdG9iCgljb25jYXQKCWxvZwoJaW50IDEKCXJldHVybgoKLy8gdXBkYXRlRHluYW1pY0FycmF5RWxlbWVudCgpdWludDY0CnVwZGF0ZUR5bmFtaWNBcnJheUVsZW1lbnQ6Cglwcm90byAwIDEKCgkvLyBQdXNoIGVtcHR5IGJ5dGVzIGFmdGVyIHRoZSBmcmFtZSBwb2ludGVyIHRvIHJlc2VydmUgc3BhY2UgZm9yIGxvY2FsIHZhcmlhYmxlcwoJYnl0ZSAweAoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czozNjkKCS8vIGE6IHVpbnQ2NFtdID0gWzExLCAyMiwgMzNdCglieXRlIDB4MDAwMDAwMDAwMDAwMDAwYjAwMDAwMDAwMDAwMDAwMTYwMDAwMDAwMDAwMDAwMDIxCglmcmFtZV9idXJ5IDAgLy8gYTogdWludDY0W10KCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MzcxCgkvLyBhWzFdID0gMjIyCglmcmFtZV9kaWcgMCAvLyBhOiB1aW50NjRbXQoJc3RvcmUgMjU1IC8vIGZ1bGwgYXJyYXkKCWxvYWQgMjU1IC8vIGZ1bGwgYXJyYXkKCWludCA4CglieXRlIDB4MDAwMDAwMDAwMDAwMDBkZQoJcmVwbGFjZTMKCWZyYW1lX2J1cnkgMCAvLyBhOiB1aW50NjRbXQoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czozNzMKCS8vIHJldHVybiBhWzFdOwoJZnJhbWVfZGlnIDAgLy8gYTogdWludDY0W10KCXN0b3JlIDI1NSAvLyBmdWxsIGFycmF5Cglsb2FkIDI1NSAvLyBmdWxsIGFycmF5CglleHRyYWN0IDggOAoJYnRvaQoKCS8vIHNldCB0aGUgc3Vicm91dGluZSByZXR1cm4gdmFsdWUKCWZyYW1lX2J1cnkgMAoJcmV0c3ViCgphYmlfcm91dGVfY3JlYXRlQXBwbGljYXRpb246CglpbnQgMQoJcmV0dXJuCgpjcmVhdGVfTm9PcDoKCW1ldGhvZCAiY3JlYXRlQXBwbGljYXRpb24oKXZvaWQiCgl0eG5hIEFwcGxpY2F0aW9uQXJncyAwCgltYXRjaCBhYmlfcm91dGVfY3JlYXRlQXBwbGljYXRpb24KCWVycgoKY2FsbF9Ob09wOgoJbWV0aG9kICJ1cGRhdGVEeW5hbWljQXJyYXlFbGVtZW50KCl1aW50NjQiCgl0eG5hIEFwcGxpY2F0aW9uQXJncyAwCgltYXRjaCBhYmlfcm91dGVfdXBkYXRlRHluYW1pY0FycmF5RWxlbWVudAoJZXJy",
+    "approval": "I3ByYWdtYSB2ZXJzaW9uIDkKCi8vIFRoaXMgVEVBTCB3YXMgZ2VuZXJhdGVkIGJ5IFRFQUxTY3JpcHQgdjAuNzQuMAovLyBodHRwczovL2dpdGh1Yi5jb20vYWxnb3JhbmRmb3VuZGF0aW9uL1RFQUxTY3JpcHQKCi8vIFRoaXMgY29udHJhY3QgaXMgY29tcGxpYW50IHdpdGggYW5kL29yIGltcGxlbWVudHMgdGhlIGZvbGxvd2luZyBBUkNzOiBbIEFSQzQgXQoKLy8gVGhlIGZvbGxvd2luZyB0ZW4gbGluZXMgb2YgVEVBTCBoYW5kbGUgaW5pdGlhbCBwcm9ncmFtIGZsb3cKLy8gVGhpcyBwYXR0ZXJuIGlzIHVzZWQgdG8gbWFrZSBpdCBlYXN5IGZvciBhbnlvbmUgdG8gcGFyc2UgdGhlIHN0YXJ0IG9mIHRoZSBwcm9ncmFtIGFuZCBkZXRlcm1pbmUgaWYgYSBzcGVjaWZpYyBhY3Rpb24gaXMgYWxsb3dlZAovLyBIZXJlLCBhY3Rpb24gcmVmZXJzIHRvIHRoZSBPbkNvbXBsZXRlIGluIGNvbWJpbmF0aW9uIHdpdGggd2hldGhlciB0aGUgYXBwIGlzIGJlaW5nIGNyZWF0ZWQgb3IgY2FsbGVkCi8vIEV2ZXJ5IHBvc3NpYmxlIGFjdGlvbiBmb3IgdGhpcyBjb250cmFjdCBpcyByZXByZXNlbnRlZCBpbiB0aGUgc3dpdGNoIHN0YXRlbWVudAovLyBJZiB0aGUgYWN0aW9uIGlzIG5vdCBpbXBsbWVudGVkIGluIHRoZSBjb250cmFjdCwgaXRzIHJlc3BlY3RpdmUgYnJhbmNoIHdpbGwgYmUgIk5PVF9JTVBMRU1FTlRFRCIgd2hpY2gganVzdCBjb250YWlucyAiZXJyIgp0eG4gQXBwbGljYXRpb25JRAohCmludCA2CioKdHhuIE9uQ29tcGxldGlvbgorCnN3aXRjaCBjYWxsX05vT3AgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBjcmVhdGVfTm9PcCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVECgpOT1RfSU1QTEVNRU5URUQ6CgllcnIKCmFiaV9yb3V0ZV91cGRhdGVEeW5hbWljQXJyYXlFbGVtZW50OgoJLy8gVGhlIEFCSSByZXR1cm4gcHJlZml4CglieXRlIDB4MTUxZjdjNzUKCgkvLyBleGVjdXRlIHVwZGF0ZUR5bmFtaWNBcnJheUVsZW1lbnQoKXVpbnQ2NAoJY2FsbHN1YiB1cGRhdGVEeW5hbWljQXJyYXlFbGVtZW50CglpdG9iCgljb25jYXQKCWxvZwoJaW50IDEKCXJldHVybgoKLy8gdXBkYXRlRHluYW1pY0FycmF5RWxlbWVudCgpdWludDY0CnVwZGF0ZUR5bmFtaWNBcnJheUVsZW1lbnQ6Cglwcm90byAwIDEKCgkvLyBQdXNoIGVtcHR5IGJ5dGVzIGFmdGVyIHRoZSBmcmFtZSBwb2ludGVyIHRvIHJlc2VydmUgc3BhY2UgZm9yIGxvY2FsIHZhcmlhYmxlcwoJYnl0ZSAweAoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czozNjkKCS8vIGE6IHVpbnQ2NFtdID0gWzExLCAyMiwgMzNdCglieXRlIDB4MDAwMDAwMDAwMDAwMDAwYjAwMDAwMDAwMDAwMDAwMTYwMDAwMDAwMDAwMDAwMDIxCglmcmFtZV9idXJ5IDAgLy8gYTogdWludDY0W10KCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MzcxCgkvLyBhWzFdID0gMjIyCglmcmFtZV9kaWcgMCAvLyBhOiB1aW50NjRbXQoJc3RvcmUgMjU1IC8vIGZ1bGwgYXJyYXkKCWxvYWQgMjU1IC8vIGZ1bGwgYXJyYXkKCWJ5dGUgMHgwMDAwMDAwMDAwMDAwMGRlCglyZXBsYWNlMiA4CglmcmFtZV9idXJ5IDAgLy8gYTogdWludDY0W10KCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MzczCgkvLyByZXR1cm4gYVsxXTsKCWZyYW1lX2RpZyAwIC8vIGE6IHVpbnQ2NFtdCglzdG9yZSAyNTUgLy8gZnVsbCBhcnJheQoJbG9hZCAyNTUgLy8gZnVsbCBhcnJheQoJZXh0cmFjdCA4IDgKCWJ0b2kKCgkvLyBzZXQgdGhlIHN1YnJvdXRpbmUgcmV0dXJuIHZhbHVlCglmcmFtZV9idXJ5IDAKCXJldHN1YgoKYWJpX3JvdXRlX2NyZWF0ZUFwcGxpY2F0aW9uOgoJaW50IDEKCXJldHVybgoKY3JlYXRlX05vT3A6CgltZXRob2QgImNyZWF0ZUFwcGxpY2F0aW9uKCl2b2lkIgoJdHhuYSBBcHBsaWNhdGlvbkFyZ3MgMAoJbWF0Y2ggYWJpX3JvdXRlX2NyZWF0ZUFwcGxpY2F0aW9uCgllcnIKCmNhbGxfTm9PcDoKCW1ldGhvZCAidXBkYXRlRHluYW1pY0FycmF5RWxlbWVudCgpdWludDY0IgoJdHhuYSBBcHBsaWNhdGlvbkFyZ3MgMAoJbWF0Y2ggYWJpX3JvdXRlX3VwZGF0ZUR5bmFtaWNBcnJheUVsZW1lbnQKCWVycg==",
     "clear": "I3ByYWdtYSB2ZXJzaW9uIDk="
   },
   "contract": {
diff --git a/tests/contracts/artifacts/ABITestUpdateDynamicArrayInTuple.approval.teal b/tests/contracts/artifacts/ABITestUpdateDynamicArrayInTuple.approval.teal
index 36ed65587..e099251c5 100644
--- a/tests/contracts/artifacts/ABITestUpdateDynamicArrayInTuple.approval.teal
+++ b/tests/contracts/artifacts/ABITestUpdateDynamicArrayInTuple.approval.teal
@@ -63,9 +63,8 @@ updateDynamicArrayInTuple:
 	frame_dig 0 // a: [uint<8>, uint16[], uint<8>[], uint16[], uint<8>[]]
 	store 255 // full array
 	load 255 // full array
-	int 0
 	byte 0x63
-	replace3
+	replace2 0
 	frame_bury 0 // a: [uint<8>, uint16[], uint<8>[], uint16[], uint<8>[]]
 
 	// tests/contracts/abi.algo.ts:409
diff --git a/tests/contracts/artifacts/ABITestUpdateDynamicArrayInTuple.arc32.json b/tests/contracts/artifacts/ABITestUpdateDynamicArrayInTuple.arc32.json
index d72aab8a2..0a813a426 100644
--- a/tests/contracts/artifacts/ABITestUpdateDynamicArrayInTuple.arc32.json
+++ b/tests/contracts/artifacts/ABITestUpdateDynamicArrayInTuple.arc32.json
@@ -39,7 +39,7 @@
     }
   },
   "source": {
-    "approval": "#pragma version 9

// This TEAL was generated by TEALScript v0.74.0
// https://github.com/algorandfoundation/TEALScript

// This contract is compliant with and/or implements the following ARCs: [ ARC4 ]

// The following ten lines of TEAL handle initial program flow
// This pattern is used to make it easy for anyone to parse the start of the program and determine if a specific action is allowed
// Here, action refers to the OnComplete in combination with whether the app is being created or called
// Every possible action for this contract is represented in the switch statement
// If the action is not implmented in the contract, its respective branch will be "NOT_IMPLEMENTED" which just contains "err"
txn ApplicationID
!
int 6
*
txn OnCompletion
+
switch call_NoOp NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED create_NoOp NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED

NOT_IMPLEMENTED:
	err

abi_route_updateDynamicArrayInTuple:
	// The ABI return prefix
	byte 0x151f7c75

	// execute updateDynamicArrayInTuple()(uint8,uint16[],uint8[],uint16[],uint8[])
	callsub updateDynamicArrayInTuple
	concat
	log
	int 1
	return

// updateDynamicArrayInTuple()(uint8,uint16[],uint8[],uint16[],uint8[])
updateDynamicArrayInTuple:
	proto 0 1

	// Push empty bytes after the frame pointer to reserve space for local variables
	byte 0x

	// tests/contracts/abi.algo.ts:406
	// a: [uint<8>, uint16[], uint<8>[], uint16[], uint<8>[]] = [9, [8], [7], [6], [5]]
	byte 0x // initial head
	byte 0x // initial tail
	byte 0x0009 // initial head offset
	byte 0x09
	callsub process_static_tuple_element
	byte 0x00010008
	callsub process_dynamic_tuple_element
	byte 0x000107
	callsub process_dynamic_tuple_element
	byte 0x00010006
	callsub process_dynamic_tuple_element
	byte 0x000105
	callsub process_dynamic_tuple_element
	pop // pop head offset
	concat // concat head and tail
	frame_bury 0 // a: [uint<8>, uint16[], uint<8>[], uint16[], uint<8>[]]

	// tests/contracts/abi.algo.ts:408
	// a[0] = 99 as uint<8>
	frame_dig 0 // a: [uint<8>, uint16[], uint<8>[], uint16[], uint<8>[]]
	store 255 // full array
	load 255 // full array
	int 0
	byte 0x63
	replace3
	frame_bury 0 // a: [uint<8>, uint16[], uint<8>[], uint16[], uint<8>[]]

	// tests/contracts/abi.algo.ts:409
	// a[1] = [10, 11]
	frame_dig 0 // a: [uint<8>, uint16[], uint<8>[], uint16[], uint<8>[]]
	store 255 // full array
	int 1
	dup
	store 251 // element head offset
	load 255 // full array
	load 255 // full array
	uncover 2
	extract_uint16
	dup
	store 254 // element start
	dup // duplicate start of element
	load 255 // full array
	swap
	extract_uint16 // get number of elements
	int 2 // get type length
	* // multiply by type length
	int 2
	+ // add two for length
	store 253 // element length
	load 255 // full array
	int 0
	load 254 // element start
	substring3
	byte 0x0002000a000b
	dup
	store 252 // new element
	load 255 // full array
	load 254 // element start
	load 253 // element length
	+ // get end of Element
	load 255 // full array
	len
	substring3
	concat
	concat
	store 255 // full array
	callsub get_length_difference
	load 250 // length difference
	load 251 // element head offset
	int 2
	+ // head ofset
	callsub update_dynamic_head
	load 250 // length difference
	load 251 // element head offset
	int 4
	+ // head ofset
	callsub update_dynamic_head
	load 250 // length difference
	load 251 // element head offset
	int 6
	+ // head ofset
	callsub update_dynamic_head
	load 255 // full array
	frame_bury 0 // a: [uint<8>, uint16[], uint<8>[], uint16[], uint<8>[]]

	// tests/contracts/abi.algo.ts:410
	// a[2] = [12, 13]
	frame_dig 0 // a: [uint<8>, uint16[], uint<8>[], uint16[], uint<8>[]]
	store 255 // full array
	int 3
	dup
	store 251 // element head offset
	load 255 // full array
	load 255 // full array
	uncover 2
	extract_uint16
	dup
	store 254 // element start
	dup // duplicate start of element
	load 255 // full array
	swap
	extract_uint16 // get number of elements
	int 1 // get type length
	* // multiply by type length
	int 2
	+ // add two for length
	store 253 // element length
	load 255 // full array
	int 0
	load 254 // element start
	substring3
	byte 0x00020c0d
	dup
	store 252 // new element
	load 255 // full array
	load 254 // element start
	load 253 // element length
	+ // get end of Element
	load 255 // full array
	len
	substring3
	concat
	concat
	store 255 // full array
	callsub get_length_difference
	load 250 // length difference
	load 251 // element head offset
	int 2
	+ // head ofset
	callsub update_dynamic_head
	load 250 // length difference
	load 251 // element head offset
	int 4
	+ // head ofset
	callsub update_dynamic_head
	load 255 // full array
	frame_bury 0 // a: [uint<8>, uint16[], uint<8>[], uint16[], uint<8>[]]

	// tests/contracts/abi.algo.ts:411
	// a[3] = [14, 15]
	frame_dig 0 // a: [uint<8>, uint16[], uint<8>[], uint16[], uint<8>[]]
	store 255 // full array
	int 5
	dup
	store 251 // element head offset
	load 255 // full array
	load 255 // full array
	uncover 2
	extract_uint16
	dup
	store 254 // element start
	dup // duplicate start of element
	load 255 // full array
	swap
	extract_uint16 // get number of elements
	int 2 // get type length
	* // multiply by type length
	int 2
	+ // add two for length
	store 253 // element length
	load 255 // full array
	int 0
	load 254 // element start
	substring3
	byte 0x0002000e000f
	dup
	store 252 // new element
	load 255 // full array
	load 254 // element start
	load 253 // element length
	+ // get end of Element
	load 255 // full array
	len
	substring3
	concat
	concat
	store 255 // full array
	callsub get_length_difference
	load 250 // length difference
	load 251 // element head offset
	int 2
	+ // head ofset
	callsub update_dynamic_head
	load 255 // full array
	frame_bury 0 // a: [uint<8>, uint16[], uint<8>[], uint16[], uint<8>[]]

	// tests/contracts/abi.algo.ts:412
	// a[4] = [16, 17]
	frame_dig 0 // a: [uint<8>, uint16[], uint<8>[], uint16[], uint<8>[]]
	store 255 // full array
	int 7
	dup
	store 251 // element head offset
	load 255 // full array
	load 255 // full array
	uncover 2
	extract_uint16
	dup
	store 254 // element start
	dup // duplicate start of element
	load 255 // full array
	swap
	extract_uint16 // get number of elements
	int 1 // get type length
	* // multiply by type length
	int 2
	+ // add two for length
	store 253 // element length
	load 255 // full array
	int 0
	load 254 // element start
	substring3
	byte 0x00021011
	dup
	store 252 // new element
	load 255 // full array
	load 254 // element start
	load 253 // element length
	+ // get end of Element
	load 255 // full array
	len
	substring3
	concat
	concat
	store 255 // full array
	callsub get_length_difference
	load 255 // full array
	frame_bury 0 // a: [uint<8>, uint16[], uint<8>[], uint16[], uint<8>[]]

	// tests/contracts/abi.algo.ts:414
	// return a;
	frame_dig 0 // a: [uint<8>, uint16[], uint<8>[], uint16[], uint<8>[]]

	// set the subroutine return value
	frame_bury 0
	retsub

abi_route_createApplication:
	int 1
	return

create_NoOp:
	method "createApplication()void"
	txna ApplicationArgs 0
	match abi_route_createApplication
	err

call_NoOp:
	method "updateDynamicArrayInTuple()(uint8,uint16[],uint8[],uint16[],uint8[])"
	txna ApplicationArgs 0
	match abi_route_updateDynamicArrayInTuple
	err

process_static_tuple_element:
	proto 4 3
	frame_dig -4 // tuple head
	frame_dig -1 // element
	concat
	frame_dig -3 // tuple tail
	frame_dig -2 // head offset
	retsub

process_dynamic_tuple_element:
	proto 4 3
	frame_dig -4 // tuple head
	frame_dig -2 // head offset
	concat
	frame_bury -4 // tuple head
	frame_dig -1 // element
	dup
	len
	frame_dig -2 // head offset
	btoi
	+
	itob
	extract 6 2
	frame_bury -2 // head offset
	frame_dig -3 // tuple tail
	swap
	concat
	frame_bury -3 // tuple tail
	frame_dig -4 // tuple head
	frame_dig -3 // tuple tail
	frame_dig -2 // head offset
	retsub

update_dynamic_head:
	proto 2 0
	frame_dig -2 // length difference
	load 255 // full array
	frame_dig -1 // dynamic array offset
	extract_uint16 // extract dynamic array offset
	load 249 // subtract head difference
	bz subtract_head_difference
	+ // add difference to offset
	b end_calc_new_head

subtract_head_difference:
	swap
	- // subtract difference from offet

end_calc_new_head:
	itob // convert to bytes
	extract 6 2 // convert to uint16
	load 255 // full array
	swap
	frame_dig -1 // offset
	swap
	replace3 // update offset
	store 255 // full array
	retsub

get_length_difference:
	load 252 // new element
	len // length of new element
	load 253 // element length
	<
	bnz swapped_difference
	load 252 // new element
	len // length of new element
	load 253 // element length
	int 1
	store 249 // subtract head difference
	b get_difference

swapped_difference:
	load 253 // element length
	load 252 // new element
	len // length of new element
	int 0
	store 249 // subtract head difference

get_difference:
	- // get length difference
	store 250 // length difference
	retsub",
+    "approval": "#pragma version 9

// This TEAL was generated by TEALScript v0.74.0
// https://github.com/algorandfoundation/TEALScript

// This contract is compliant with and/or implements the following ARCs: [ ARC4 ]

// The following ten lines of TEAL handle initial program flow
// This pattern is used to make it easy for anyone to parse the start of the program and determine if a specific action is allowed
// Here, action refers to the OnComplete in combination with whether the app is being created or called
// Every possible action for this contract is represented in the switch statement
// If the action is not implmented in the contract, its respective branch will be "NOT_IMPLEMENTED" which just contains "err"
txn ApplicationID
!
int 6
*
txn OnCompletion
+
switch call_NoOp NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED create_NoOp NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED

NOT_IMPLEMENTED:
	err

abi_route_updateDynamicArrayInTuple:
	// The ABI return prefix
	byte 0x151f7c75

	// execute updateDynamicArrayInTuple()(uint8,uint16[],uint8[],uint16[],uint8[])
	callsub updateDynamicArrayInTuple
	concat
	log
	int 1
	return

// updateDynamicArrayInTuple()(uint8,uint16[],uint8[],uint16[],uint8[])
updateDynamicArrayInTuple:
	proto 0 1

	// Push empty bytes after the frame pointer to reserve space for local variables
	byte 0x

	// tests/contracts/abi.algo.ts:406
	// a: [uint<8>, uint16[], uint<8>[], uint16[], uint<8>[]] = [9, [8], [7], [6], [5]]
	byte 0x // initial head
	byte 0x // initial tail
	byte 0x0009 // initial head offset
	byte 0x09
	callsub process_static_tuple_element
	byte 0x00010008
	callsub process_dynamic_tuple_element
	byte 0x000107
	callsub process_dynamic_tuple_element
	byte 0x00010006
	callsub process_dynamic_tuple_element
	byte 0x000105
	callsub process_dynamic_tuple_element
	pop // pop head offset
	concat // concat head and tail
	frame_bury 0 // a: [uint<8>, uint16[], uint<8>[], uint16[], uint<8>[]]

	// tests/contracts/abi.algo.ts:408
	// a[0] = 99 as uint<8>
	frame_dig 0 // a: [uint<8>, uint16[], uint<8>[], uint16[], uint<8>[]]
	store 255 // full array
	load 255 // full array
	byte 0x63
	replace2 0
	frame_bury 0 // a: [uint<8>, uint16[], uint<8>[], uint16[], uint<8>[]]

	// tests/contracts/abi.algo.ts:409
	// a[1] = [10, 11]
	frame_dig 0 // a: [uint<8>, uint16[], uint<8>[], uint16[], uint<8>[]]
	store 255 // full array
	int 1
	dup
	store 251 // element head offset
	load 255 // full array
	load 255 // full array
	uncover 2
	extract_uint16
	dup
	store 254 // element start
	dup // duplicate start of element
	load 255 // full array
	swap
	extract_uint16 // get number of elements
	int 2 // get type length
	* // multiply by type length
	int 2
	+ // add two for length
	store 253 // element length
	load 255 // full array
	int 0
	load 254 // element start
	substring3
	byte 0x0002000a000b
	dup
	store 252 // new element
	load 255 // full array
	load 254 // element start
	load 253 // element length
	+ // get end of Element
	load 255 // full array
	len
	substring3
	concat
	concat
	store 255 // full array
	callsub get_length_difference
	load 250 // length difference
	load 251 // element head offset
	int 2
	+ // head ofset
	callsub update_dynamic_head
	load 250 // length difference
	load 251 // element head offset
	int 4
	+ // head ofset
	callsub update_dynamic_head
	load 250 // length difference
	load 251 // element head offset
	int 6
	+ // head ofset
	callsub update_dynamic_head
	load 255 // full array
	frame_bury 0 // a: [uint<8>, uint16[], uint<8>[], uint16[], uint<8>[]]

	// tests/contracts/abi.algo.ts:410
	// a[2] = [12, 13]
	frame_dig 0 // a: [uint<8>, uint16[], uint<8>[], uint16[], uint<8>[]]
	store 255 // full array
	int 3
	dup
	store 251 // element head offset
	load 255 // full array
	load 255 // full array
	uncover 2
	extract_uint16
	dup
	store 254 // element start
	dup // duplicate start of element
	load 255 // full array
	swap
	extract_uint16 // get number of elements
	int 1 // get type length
	* // multiply by type length
	int 2
	+ // add two for length
	store 253 // element length
	load 255 // full array
	int 0
	load 254 // element start
	substring3
	byte 0x00020c0d
	dup
	store 252 // new element
	load 255 // full array
	load 254 // element start
	load 253 // element length
	+ // get end of Element
	load 255 // full array
	len
	substring3
	concat
	concat
	store 255 // full array
	callsub get_length_difference
	load 250 // length difference
	load 251 // element head offset
	int 2
	+ // head ofset
	callsub update_dynamic_head
	load 250 // length difference
	load 251 // element head offset
	int 4
	+ // head ofset
	callsub update_dynamic_head
	load 255 // full array
	frame_bury 0 // a: [uint<8>, uint16[], uint<8>[], uint16[], uint<8>[]]

	// tests/contracts/abi.algo.ts:411
	// a[3] = [14, 15]
	frame_dig 0 // a: [uint<8>, uint16[], uint<8>[], uint16[], uint<8>[]]
	store 255 // full array
	int 5
	dup
	store 251 // element head offset
	load 255 // full array
	load 255 // full array
	uncover 2
	extract_uint16
	dup
	store 254 // element start
	dup // duplicate start of element
	load 255 // full array
	swap
	extract_uint16 // get number of elements
	int 2 // get type length
	* // multiply by type length
	int 2
	+ // add two for length
	store 253 // element length
	load 255 // full array
	int 0
	load 254 // element start
	substring3
	byte 0x0002000e000f
	dup
	store 252 // new element
	load 255 // full array
	load 254 // element start
	load 253 // element length
	+ // get end of Element
	load 255 // full array
	len
	substring3
	concat
	concat
	store 255 // full array
	callsub get_length_difference
	load 250 // length difference
	load 251 // element head offset
	int 2
	+ // head ofset
	callsub update_dynamic_head
	load 255 // full array
	frame_bury 0 // a: [uint<8>, uint16[], uint<8>[], uint16[], uint<8>[]]

	// tests/contracts/abi.algo.ts:412
	// a[4] = [16, 17]
	frame_dig 0 // a: [uint<8>, uint16[], uint<8>[], uint16[], uint<8>[]]
	store 255 // full array
	int 7
	dup
	store 251 // element head offset
	load 255 // full array
	load 255 // full array
	uncover 2
	extract_uint16
	dup
	store 254 // element start
	dup // duplicate start of element
	load 255 // full array
	swap
	extract_uint16 // get number of elements
	int 1 // get type length
	* // multiply by type length
	int 2
	+ // add two for length
	store 253 // element length
	load 255 // full array
	int 0
	load 254 // element start
	substring3
	byte 0x00021011
	dup
	store 252 // new element
	load 255 // full array
	load 254 // element start
	load 253 // element length
	+ // get end of Element
	load 255 // full array
	len
	substring3
	concat
	concat
	store 255 // full array
	callsub get_length_difference
	load 255 // full array
	frame_bury 0 // a: [uint<8>, uint16[], uint<8>[], uint16[], uint<8>[]]

	// tests/contracts/abi.algo.ts:414
	// return a;
	frame_dig 0 // a: [uint<8>, uint16[], uint<8>[], uint16[], uint<8>[]]

	// set the subroutine return value
	frame_bury 0
	retsub

abi_route_createApplication:
	int 1
	return

create_NoOp:
	method "createApplication()void"
	txna ApplicationArgs 0
	match abi_route_createApplication
	err

call_NoOp:
	method "updateDynamicArrayInTuple()(uint8,uint16[],uint8[],uint16[],uint8[])"
	txna ApplicationArgs 0
	match abi_route_updateDynamicArrayInTuple
	err

process_static_tuple_element:
	proto 4 3
	frame_dig -4 // tuple head
	frame_dig -1 // element
	concat
	frame_dig -3 // tuple tail
	frame_dig -2 // head offset
	retsub

process_dynamic_tuple_element:
	proto 4 3
	frame_dig -4 // tuple head
	frame_dig -2 // head offset
	concat
	frame_bury -4 // tuple head
	frame_dig -1 // element
	dup
	len
	frame_dig -2 // head offset
	btoi
	+
	itob
	extract 6 2
	frame_bury -2 // head offset
	frame_dig -3 // tuple tail
	swap
	concat
	frame_bury -3 // tuple tail
	frame_dig -4 // tuple head
	frame_dig -3 // tuple tail
	frame_dig -2 // head offset
	retsub

update_dynamic_head:
	proto 2 0
	frame_dig -2 // length difference
	load 255 // full array
	frame_dig -1 // dynamic array offset
	extract_uint16 // extract dynamic array offset
	load 249 // subtract head difference
	bz subtract_head_difference
	+ // add difference to offset
	b end_calc_new_head

subtract_head_difference:
	swap
	- // subtract difference from offet

end_calc_new_head:
	itob // convert to bytes
	extract 6 2 // convert to uint16
	load 255 // full array
	swap
	frame_dig -1 // offset
	swap
	replace3 // update offset
	store 255 // full array
	retsub

get_length_difference:
	load 252 // new element
	len // length of new element
	load 253 // element length
	<
	bnz swapped_difference
	load 252 // new element
	len // length of new element
	load 253 // element length
	int 1
	store 249 // subtract head difference
	b get_difference

swapped_difference:
	load 253 // element length
	load 252 // new element
	len // length of new element
	int 0
	store 249 // subtract head difference

get_difference:
	- // get length difference
	store 250 // length difference
	retsub",
     "clear": "I3ByYWdtYSB2ZXJzaW9uIDk="
   },
   "contract": {
diff --git a/tests/contracts/artifacts/ABITestUpdateStaticArrayInStorageMap.approval.teal b/tests/contracts/artifacts/ABITestUpdateStaticArrayInStorageMap.approval.teal
index 47ba2d20d..4ca894628 100644
--- a/tests/contracts/artifacts/ABITestUpdateStaticArrayInStorageMap.approval.teal
+++ b/tests/contracts/artifacts/ABITestUpdateStaticArrayInStorageMap.approval.teal
@@ -112,9 +112,9 @@ updateStaticArrayInStorageMap:
 	itob
 	concat
 	byte 0x624d6170 // "bMap"
-	box_get
-	assert
-	extract 8 8
+	int 8
+	dup
+	box_extract
 	btoi
 	itob
 	concat
diff --git a/tests/contracts/artifacts/ABITestUpdateStaticArrayInStorageMap.arc32.json b/tests/contracts/artifacts/ABITestUpdateStaticArrayInStorageMap.arc32.json
index b7c05e8e8..9f2030064 100644
--- a/tests/contracts/artifacts/ABITestUpdateStaticArrayInStorageMap.arc32.json
+++ b/tests/contracts/artifacts/ABITestUpdateStaticArrayInStorageMap.arc32.json
@@ -49,7 +49,7 @@
     }
   },
   "source": {
-    "approval": "I3ByYWdtYSB2ZXJzaW9uIDkKCi8vIFRoaXMgVEVBTCB3YXMgZ2VuZXJhdGVkIGJ5IFRFQUxTY3JpcHQgdjAuNzQuMAovLyBodHRwczovL2dpdGh1Yi5jb20vYWxnb3JhbmRmb3VuZGF0aW9uL1RFQUxTY3JpcHQKCi8vIFRoaXMgY29udHJhY3QgaXMgY29tcGxpYW50IHdpdGggYW5kL29yIGltcGxlbWVudHMgdGhlIGZvbGxvd2luZyBBUkNzOiBbIEFSQzQgXQoKLy8gVGhlIGZvbGxvd2luZyB0ZW4gbGluZXMgb2YgVEVBTCBoYW5kbGUgaW5pdGlhbCBwcm9ncmFtIGZsb3cKLy8gVGhpcyBwYXR0ZXJuIGlzIHVzZWQgdG8gbWFrZSBpdCBlYXN5IGZvciBhbnlvbmUgdG8gcGFyc2UgdGhlIHN0YXJ0IG9mIHRoZSBwcm9ncmFtIGFuZCBkZXRlcm1pbmUgaWYgYSBzcGVjaWZpYyBhY3Rpb24gaXMgYWxsb3dlZAovLyBIZXJlLCBhY3Rpb24gcmVmZXJzIHRvIHRoZSBPbkNvbXBsZXRlIGluIGNvbWJpbmF0aW9uIHdpdGggd2hldGhlciB0aGUgYXBwIGlzIGJlaW5nIGNyZWF0ZWQgb3IgY2FsbGVkCi8vIEV2ZXJ5IHBvc3NpYmxlIGFjdGlvbiBmb3IgdGhpcyBjb250cmFjdCBpcyByZXByZXNlbnRlZCBpbiB0aGUgc3dpdGNoIHN0YXRlbWVudAovLyBJZiB0aGUgYWN0aW9uIGlzIG5vdCBpbXBsbWVudGVkIGluIHRoZSBjb250cmFjdCwgaXRzIHJlc3BlY3RpdmUgYnJhbmNoIHdpbGwgYmUgIk5PVF9JTVBMRU1FTlRFRCIgd2hpY2gganVzdCBjb250YWlucyAiZXJyIgp0eG4gQXBwbGljYXRpb25JRAohCmludCA2CioKdHhuIE9uQ29tcGxldGlvbgorCnN3aXRjaCBOT1RfSU1QTEVNRU5URUQgY2FsbF9PcHRJbiBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgY3JlYXRlX05vT3AgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRAoKTk9UX0lNUExFTUVOVEVEOgoJZXJyCgphYmlfcm91dGVfdXBkYXRlU3RhdGljQXJyYXlJblN0b3JhZ2VNYXA6CgkvLyBUaGUgQUJJIHJldHVybiBwcmVmaXgKCWJ5dGUgMHgxNTFmN2M3NQoKCS8vIGV4ZWN1dGUgdXBkYXRlU3RhdGljQXJyYXlJblN0b3JhZ2VNYXAoKXVpbnQ2NFszXQoJY2FsbHN1YiB1cGRhdGVTdGF0aWNBcnJheUluU3RvcmFnZU1hcAoJY29uY2F0Cglsb2cKCWludCAxCglyZXR1cm4KCi8vIHVwZGF0ZVN0YXRpY0FycmF5SW5TdG9yYWdlTWFwKCl1aW50NjRbM10KdXBkYXRlU3RhdGljQXJyYXlJblN0b3JhZ2VNYXA6Cglwcm90byAwIDEKCgkvLyBQdXNoIGVtcHR5IGJ5dGVzIGFmdGVyIHRoZSBmcmFtZSBwb2ludGVyIHRvIHJlc2VydmUgc3BhY2UgZm9yIGxvY2FsIHZhcmlhYmxlcwoJYnl0ZSAweAoJZHVwCgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjE3NgoJLy8gYTogU3RhdGljQXJyYXk8dWludDY0LCAzPiA9IFsxMSwgMjIsIDMzXQoJYnl0ZSAweDAwMDAwMDAwMDAwMDAwMGIwMDAwMDAwMDAwMDAwMDE2MDAwMDAwMDAwMDAwMDAyMQoJZnJhbWVfYnVyeSAwIC8vIGE6IFN0YXRpY0FycmF5PHVpbnQ2NCwgMz4KCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTc4CgkvLyB0aGlzLmdNYXAoJ2dNYXAnKS52YWx1ZSA9IGEKCWJ5dGUgMHg2NzRkNjE3MCAvLyAiZ01hcCIKCWZyYW1lX2RpZyAwIC8vIGE6IFN0YXRpY0FycmF5PHVpbnQ2NCwgMz4KCWFwcF9nbG9iYWxfcHV0CgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjE3OQoJLy8gdGhpcy5sTWFwKHRoaXMudHhuLnNlbmRlciwgJ2xNYXAnKS52YWx1ZSA9IGEKCXR4biBTZW5kZXIKCWJ5dGUgMHg2YzRkNjE3MCAvLyAibE1hcCIKCWZyYW1lX2RpZyAwIC8vIGE6IFN0YXRpY0FycmF5PHVpbnQ2NCwgMz4KCWFwcF9sb2NhbF9wdXQKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTgwCgkvLyB0aGlzLmJNYXAoJ2JNYXAnKS52YWx1ZSA9IGEKCWJ5dGUgMHg2MjRkNjE3MCAvLyAiYk1hcCIKCWZyYW1lX2RpZyAwIC8vIGE6IFN0YXRpY0FycmF5PHVpbnQ2NCwgMz4KCWJveF9wdXQKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTgyCgkvLyB0aGlzLmdNYXAoJ2dNYXAnKS52YWx1ZVsxXSA9IDExMTEKCWJ5dGUgMHg2NzRkNjE3MCAvLyAiZ01hcCIKCWFwcF9nbG9iYWxfZ2V0CglieXRlIDB4MDAwMDAwMDAwMDAwMDQ1NwoJcmVwbGFjZTIgOAoJYnl0ZSAweDY3NGQ2MTcwIC8vICJnTWFwIgoJc3dhcAoJYXBwX2dsb2JhbF9wdXQKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTgzCgkvLyB0aGlzLmxNYXAodGhpcy50eG4uc2VuZGVyLCAnbE1hcCcpLnZhbHVlWzFdID0gMjIyMgoJdHhuIFNlbmRlcgoJYnl0ZSAweDZjNGQ2MTcwIC8vICJsTWFwIgoJYXBwX2xvY2FsX2dldAoJYnl0ZSAweDAwMDAwMDAwMDAwMDA4YWUKCXJlcGxhY2UyIDgKCXR4biBTZW5kZXIKCWJ5dGUgMHg2YzRkNjE3MCAvLyAibE1hcCIKCXVuY292ZXIgMgoJYXBwX2xvY2FsX3B1dAoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czoxODQKCS8vIHRoaXMuYk1hcCgnYk1hcCcpLnZhbHVlWzFdID0gMzMzMwoJYnl0ZSAweDYyNGQ2MTcwIC8vICJiTWFwIgoJaW50IDgKCWJ5dGUgMHgwMDAwMDAwMDAwMDAwZDA1Cglib3hfcmVwbGFjZQoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czoxODYKCS8vIHJldDogU3RhdGljQXJyYXk8dWludDY0LCAzPiA9IFsKCS8vICAgICAgIHRoaXMuZ01hcCgnZ01hcCcpLnZhbHVlWzFdLAoJLy8gICAgICAgdGhpcy5sTWFwKHRoaXMudHhuLnNlbmRlciwgJ2xNYXAnKS52YWx1ZVsxXSwKCS8vICAgICAgIHRoaXMuYk1hcCgnYk1hcCcpLnZhbHVlWzFdLAoJLy8gICAgIF0KCWJ5dGUgMHg2NzRkNjE3MCAvLyAiZ01hcCIKCWFwcF9nbG9iYWxfZ2V0CglleHRyYWN0IDggOAoJYnRvaQoJaXRvYgoJdHhuIFNlbmRlcgoJYnl0ZSAweDZjNGQ2MTcwIC8vICJsTWFwIgoJYXBwX2xvY2FsX2dldAoJZXh0cmFjdCA4IDgKCWJ0b2kKCWl0b2IKCWNvbmNhdAoJYnl0ZSAweDYyNGQ2MTcwIC8vICJiTWFwIgoJYm94X2dldAoJYXNzZXJ0CglleHRyYWN0IDggOAoJYnRvaQoJaXRvYgoJY29uY2F0CglmcmFtZV9idXJ5IDEgLy8gcmV0OiBTdGF0aWNBcnJheTx1aW50NjQsIDM+CgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjE5MgoJLy8gcmV0dXJuIHJldDsKCWZyYW1lX2RpZyAxIC8vIHJldDogU3RhdGljQXJyYXk8dWludDY0LCAzPgoKCS8vIHNldCB0aGUgc3Vicm91dGluZSByZXR1cm4gdmFsdWUKCWZyYW1lX2J1cnkgMAoKCS8vIHBvcCBhbGwgbG9jYWwgdmFyaWFibGVzIGZyb20gdGhlIHN0YWNrCglwb3BuIDEKCXJldHN1YgoKYWJpX3JvdXRlX2NyZWF0ZUFwcGxpY2F0aW9uOgoJaW50IDEKCXJldHVybgoKY3JlYXRlX05vT3A6CgltZXRob2QgImNyZWF0ZUFwcGxpY2F0aW9uKCl2b2lkIgoJdHhuYSBBcHBsaWNhdGlvbkFyZ3MgMAoJbWF0Y2ggYWJpX3JvdXRlX2NyZWF0ZUFwcGxpY2F0aW9uCgllcnIKCmNhbGxfT3B0SW46CgltZXRob2QgInVwZGF0ZVN0YXRpY0FycmF5SW5TdG9yYWdlTWFwKCl1aW50NjRbM10iCgl0eG5hIEFwcGxpY2F0aW9uQXJncyAwCgltYXRjaCBhYmlfcm91dGVfdXBkYXRlU3RhdGljQXJyYXlJblN0b3JhZ2VNYXAKCWVycg==",
+    "approval": "I3ByYWdtYSB2ZXJzaW9uIDkKCi8vIFRoaXMgVEVBTCB3YXMgZ2VuZXJhdGVkIGJ5IFRFQUxTY3JpcHQgdjAuNzQuMAovLyBodHRwczovL2dpdGh1Yi5jb20vYWxnb3JhbmRmb3VuZGF0aW9uL1RFQUxTY3JpcHQKCi8vIFRoaXMgY29udHJhY3QgaXMgY29tcGxpYW50IHdpdGggYW5kL29yIGltcGxlbWVudHMgdGhlIGZvbGxvd2luZyBBUkNzOiBbIEFSQzQgXQoKLy8gVGhlIGZvbGxvd2luZyB0ZW4gbGluZXMgb2YgVEVBTCBoYW5kbGUgaW5pdGlhbCBwcm9ncmFtIGZsb3cKLy8gVGhpcyBwYXR0ZXJuIGlzIHVzZWQgdG8gbWFrZSBpdCBlYXN5IGZvciBhbnlvbmUgdG8gcGFyc2UgdGhlIHN0YXJ0IG9mIHRoZSBwcm9ncmFtIGFuZCBkZXRlcm1pbmUgaWYgYSBzcGVjaWZpYyBhY3Rpb24gaXMgYWxsb3dlZAovLyBIZXJlLCBhY3Rpb24gcmVmZXJzIHRvIHRoZSBPbkNvbXBsZXRlIGluIGNvbWJpbmF0aW9uIHdpdGggd2hldGhlciB0aGUgYXBwIGlzIGJlaW5nIGNyZWF0ZWQgb3IgY2FsbGVkCi8vIEV2ZXJ5IHBvc3NpYmxlIGFjdGlvbiBmb3IgdGhpcyBjb250cmFjdCBpcyByZXByZXNlbnRlZCBpbiB0aGUgc3dpdGNoIHN0YXRlbWVudAovLyBJZiB0aGUgYWN0aW9uIGlzIG5vdCBpbXBsbWVudGVkIGluIHRoZSBjb250cmFjdCwgaXRzIHJlc3BlY3RpdmUgYnJhbmNoIHdpbGwgYmUgIk5PVF9JTVBMRU1FTlRFRCIgd2hpY2gganVzdCBjb250YWlucyAiZXJyIgp0eG4gQXBwbGljYXRpb25JRAohCmludCA2CioKdHhuIE9uQ29tcGxldGlvbgorCnN3aXRjaCBOT1RfSU1QTEVNRU5URUQgY2FsbF9PcHRJbiBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgY3JlYXRlX05vT3AgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRAoKTk9UX0lNUExFTUVOVEVEOgoJZXJyCgphYmlfcm91dGVfdXBkYXRlU3RhdGljQXJyYXlJblN0b3JhZ2VNYXA6CgkvLyBUaGUgQUJJIHJldHVybiBwcmVmaXgKCWJ5dGUgMHgxNTFmN2M3NQoKCS8vIGV4ZWN1dGUgdXBkYXRlU3RhdGljQXJyYXlJblN0b3JhZ2VNYXAoKXVpbnQ2NFszXQoJY2FsbHN1YiB1cGRhdGVTdGF0aWNBcnJheUluU3RvcmFnZU1hcAoJY29uY2F0Cglsb2cKCWludCAxCglyZXR1cm4KCi8vIHVwZGF0ZVN0YXRpY0FycmF5SW5TdG9yYWdlTWFwKCl1aW50NjRbM10KdXBkYXRlU3RhdGljQXJyYXlJblN0b3JhZ2VNYXA6Cglwcm90byAwIDEKCgkvLyBQdXNoIGVtcHR5IGJ5dGVzIGFmdGVyIHRoZSBmcmFtZSBwb2ludGVyIHRvIHJlc2VydmUgc3BhY2UgZm9yIGxvY2FsIHZhcmlhYmxlcwoJYnl0ZSAweAoJZHVwCgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjE3NgoJLy8gYTogU3RhdGljQXJyYXk8dWludDY0LCAzPiA9IFsxMSwgMjIsIDMzXQoJYnl0ZSAweDAwMDAwMDAwMDAwMDAwMGIwMDAwMDAwMDAwMDAwMDE2MDAwMDAwMDAwMDAwMDAyMQoJZnJhbWVfYnVyeSAwIC8vIGE6IFN0YXRpY0FycmF5PHVpbnQ2NCwgMz4KCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTc4CgkvLyB0aGlzLmdNYXAoJ2dNYXAnKS52YWx1ZSA9IGEKCWJ5dGUgMHg2NzRkNjE3MCAvLyAiZ01hcCIKCWZyYW1lX2RpZyAwIC8vIGE6IFN0YXRpY0FycmF5PHVpbnQ2NCwgMz4KCWFwcF9nbG9iYWxfcHV0CgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjE3OQoJLy8gdGhpcy5sTWFwKHRoaXMudHhuLnNlbmRlciwgJ2xNYXAnKS52YWx1ZSA9IGEKCXR4biBTZW5kZXIKCWJ5dGUgMHg2YzRkNjE3MCAvLyAibE1hcCIKCWZyYW1lX2RpZyAwIC8vIGE6IFN0YXRpY0FycmF5PHVpbnQ2NCwgMz4KCWFwcF9sb2NhbF9wdXQKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTgwCgkvLyB0aGlzLmJNYXAoJ2JNYXAnKS52YWx1ZSA9IGEKCWJ5dGUgMHg2MjRkNjE3MCAvLyAiYk1hcCIKCWZyYW1lX2RpZyAwIC8vIGE6IFN0YXRpY0FycmF5PHVpbnQ2NCwgMz4KCWJveF9wdXQKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTgyCgkvLyB0aGlzLmdNYXAoJ2dNYXAnKS52YWx1ZVsxXSA9IDExMTEKCWJ5dGUgMHg2NzRkNjE3MCAvLyAiZ01hcCIKCWFwcF9nbG9iYWxfZ2V0CglieXRlIDB4MDAwMDAwMDAwMDAwMDQ1NwoJcmVwbGFjZTIgOAoJYnl0ZSAweDY3NGQ2MTcwIC8vICJnTWFwIgoJc3dhcAoJYXBwX2dsb2JhbF9wdXQKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTgzCgkvLyB0aGlzLmxNYXAodGhpcy50eG4uc2VuZGVyLCAnbE1hcCcpLnZhbHVlWzFdID0gMjIyMgoJdHhuIFNlbmRlcgoJYnl0ZSAweDZjNGQ2MTcwIC8vICJsTWFwIgoJYXBwX2xvY2FsX2dldAoJYnl0ZSAweDAwMDAwMDAwMDAwMDA4YWUKCXJlcGxhY2UyIDgKCXR4biBTZW5kZXIKCWJ5dGUgMHg2YzRkNjE3MCAvLyAibE1hcCIKCXVuY292ZXIgMgoJYXBwX2xvY2FsX3B1dAoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czoxODQKCS8vIHRoaXMuYk1hcCgnYk1hcCcpLnZhbHVlWzFdID0gMzMzMwoJYnl0ZSAweDYyNGQ2MTcwIC8vICJiTWFwIgoJaW50IDgKCWJ5dGUgMHgwMDAwMDAwMDAwMDAwZDA1Cglib3hfcmVwbGFjZQoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czoxODYKCS8vIHJldDogU3RhdGljQXJyYXk8dWludDY0LCAzPiA9IFsKCS8vICAgICAgIHRoaXMuZ01hcCgnZ01hcCcpLnZhbHVlWzFdLAoJLy8gICAgICAgdGhpcy5sTWFwKHRoaXMudHhuLnNlbmRlciwgJ2xNYXAnKS52YWx1ZVsxXSwKCS8vICAgICAgIHRoaXMuYk1hcCgnYk1hcCcpLnZhbHVlWzFdLAoJLy8gICAgIF0KCWJ5dGUgMHg2NzRkNjE3MCAvLyAiZ01hcCIKCWFwcF9nbG9iYWxfZ2V0CglleHRyYWN0IDggOAoJYnRvaQoJaXRvYgoJdHhuIFNlbmRlcgoJYnl0ZSAweDZjNGQ2MTcwIC8vICJsTWFwIgoJYXBwX2xvY2FsX2dldAoJZXh0cmFjdCA4IDgKCWJ0b2kKCWl0b2IKCWNvbmNhdAoJYnl0ZSAweDYyNGQ2MTcwIC8vICJiTWFwIgoJaW50IDgKCWR1cAoJYm94X2V4dHJhY3QKCWJ0b2kKCWl0b2IKCWNvbmNhdAoJZnJhbWVfYnVyeSAxIC8vIHJldDogU3RhdGljQXJyYXk8dWludDY0LCAzPgoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czoxOTIKCS8vIHJldHVybiByZXQ7CglmcmFtZV9kaWcgMSAvLyByZXQ6IFN0YXRpY0FycmF5PHVpbnQ2NCwgMz4KCgkvLyBzZXQgdGhlIHN1YnJvdXRpbmUgcmV0dXJuIHZhbHVlCglmcmFtZV9idXJ5IDAKCgkvLyBwb3AgYWxsIGxvY2FsIHZhcmlhYmxlcyBmcm9tIHRoZSBzdGFjawoJcG9wbiAxCglyZXRzdWIKCmFiaV9yb3V0ZV9jcmVhdGVBcHBsaWNhdGlvbjoKCWludCAxCglyZXR1cm4KCmNyZWF0ZV9Ob09wOgoJbWV0aG9kICJjcmVhdGVBcHBsaWNhdGlvbigpdm9pZCIKCXR4bmEgQXBwbGljYXRpb25BcmdzIDAKCW1hdGNoIGFiaV9yb3V0ZV9jcmVhdGVBcHBsaWNhdGlvbgoJZXJyCgpjYWxsX09wdEluOgoJbWV0aG9kICJ1cGRhdGVTdGF0aWNBcnJheUluU3RvcmFnZU1hcCgpdWludDY0WzNdIgoJdHhuYSBBcHBsaWNhdGlvbkFyZ3MgMAoJbWF0Y2ggYWJpX3JvdXRlX3VwZGF0ZVN0YXRpY0FycmF5SW5TdG9yYWdlTWFwCgllcnI=",
     "clear": "I3ByYWdtYSB2ZXJzaW9uIDk="
   },
   "contract": {
diff --git a/tests/contracts/artifacts/ABITestUpdateStaticArrayInStorageRef.approval.teal b/tests/contracts/artifacts/ABITestUpdateStaticArrayInStorageRef.approval.teal
index 86005d988..545686d62 100644
--- a/tests/contracts/artifacts/ABITestUpdateStaticArrayInStorageRef.approval.teal
+++ b/tests/contracts/artifacts/ABITestUpdateStaticArrayInStorageRef.approval.teal
@@ -108,9 +108,9 @@ updateStaticArrayInStorageRef:
 	itob
 	concat
 	byte 0x62526566 // "bRef"
-	box_get
-	assert
-	extract 8 8
+	int 8
+	dup
+	box_extract
 	btoi
 	itob
 	concat
diff --git a/tests/contracts/artifacts/ABITestUpdateStaticArrayInStorageRef.arc32.json b/tests/contracts/artifacts/ABITestUpdateStaticArrayInStorageRef.arc32.json
index de413108f..bf6e6768b 100644
--- a/tests/contracts/artifacts/ABITestUpdateStaticArrayInStorageRef.arc32.json
+++ b/tests/contracts/artifacts/ABITestUpdateStaticArrayInStorageRef.arc32.json
@@ -49,7 +49,7 @@
     }
   },
   "source": {
-    "approval": "I3ByYWdtYSB2ZXJzaW9uIDkKCi8vIFRoaXMgVEVBTCB3YXMgZ2VuZXJhdGVkIGJ5IFRFQUxTY3JpcHQgdjAuNzQuMAovLyBodHRwczovL2dpdGh1Yi5jb20vYWxnb3JhbmRmb3VuZGF0aW9uL1RFQUxTY3JpcHQKCi8vIFRoaXMgY29udHJhY3QgaXMgY29tcGxpYW50IHdpdGggYW5kL29yIGltcGxlbWVudHMgdGhlIGZvbGxvd2luZyBBUkNzOiBbIEFSQzQgXQoKLy8gVGhlIGZvbGxvd2luZyB0ZW4gbGluZXMgb2YgVEVBTCBoYW5kbGUgaW5pdGlhbCBwcm9ncmFtIGZsb3cKLy8gVGhpcyBwYXR0ZXJuIGlzIHVzZWQgdG8gbWFrZSBpdCBlYXN5IGZvciBhbnlvbmUgdG8gcGFyc2UgdGhlIHN0YXJ0IG9mIHRoZSBwcm9ncmFtIGFuZCBkZXRlcm1pbmUgaWYgYSBzcGVjaWZpYyBhY3Rpb24gaXMgYWxsb3dlZAovLyBIZXJlLCBhY3Rpb24gcmVmZXJzIHRvIHRoZSBPbkNvbXBsZXRlIGluIGNvbWJpbmF0aW9uIHdpdGggd2hldGhlciB0aGUgYXBwIGlzIGJlaW5nIGNyZWF0ZWQgb3IgY2FsbGVkCi8vIEV2ZXJ5IHBvc3NpYmxlIGFjdGlvbiBmb3IgdGhpcyBjb250cmFjdCBpcyByZXByZXNlbnRlZCBpbiB0aGUgc3dpdGNoIHN0YXRlbWVudAovLyBJZiB0aGUgYWN0aW9uIGlzIG5vdCBpbXBsbWVudGVkIGluIHRoZSBjb250cmFjdCwgaXRzIHJlc3BlY3RpdmUgYnJhbmNoIHdpbGwgYmUgIk5PVF9JTVBMRU1FTlRFRCIgd2hpY2gganVzdCBjb250YWlucyAiZXJyIgp0eG4gQXBwbGljYXRpb25JRAohCmludCA2CioKdHhuIE9uQ29tcGxldGlvbgorCnN3aXRjaCBOT1RfSU1QTEVNRU5URUQgY2FsbF9PcHRJbiBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgY3JlYXRlX05vT3AgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRAoKTk9UX0lNUExFTUVOVEVEOgoJZXJyCgphYmlfcm91dGVfdXBkYXRlU3RhdGljQXJyYXlJblN0b3JhZ2VSZWY6CgkvLyBUaGUgQUJJIHJldHVybiBwcmVmaXgKCWJ5dGUgMHgxNTFmN2M3NQoKCS8vIGV4ZWN1dGUgdXBkYXRlU3RhdGljQXJyYXlJblN0b3JhZ2VSZWYoKXVpbnQ2NFszXQoJY2FsbHN1YiB1cGRhdGVTdGF0aWNBcnJheUluU3RvcmFnZVJlZgoJY29uY2F0Cglsb2cKCWludCAxCglyZXR1cm4KCi8vIHVwZGF0ZVN0YXRpY0FycmF5SW5TdG9yYWdlUmVmKCl1aW50NjRbM10KdXBkYXRlU3RhdGljQXJyYXlJblN0b3JhZ2VSZWY6Cglwcm90byAwIDEKCgkvLyBQdXNoIGVtcHR5IGJ5dGVzIGFmdGVyIHRoZSBmcmFtZSBwb2ludGVyIHRvIHJlc2VydmUgc3BhY2UgZm9yIGxvY2FsIHZhcmlhYmxlcwoJYnl0ZSAweAoJZHVwCgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjExNAoJLy8gYTogU3RhdGljQXJyYXk8dWludDY0LCAzPiA9IFsxMSwgMjIsIDMzXQoJYnl0ZSAweDAwMDAwMDAwMDAwMDAwMGIwMDAwMDAwMDAwMDAwMDE2MDAwMDAwMDAwMDAwMDAyMQoJZnJhbWVfYnVyeSAwIC8vIGE6IFN0YXRpY0FycmF5PHVpbnQ2NCwgMz4KCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTE2CgkvLyB0aGlzLmdSZWYudmFsdWUgPSBhCglieXRlIDB4Njc1MjY1NjYgLy8gImdSZWYiCglmcmFtZV9kaWcgMCAvLyBhOiBTdGF0aWNBcnJheTx1aW50NjQsIDM+CglhcHBfZ2xvYmFsX3B1dAoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czoxMTcKCS8vIHRoaXMubFJlZih0aGlzLnR4bi5zZW5kZXIpLnZhbHVlID0gYQoJdHhuIFNlbmRlcgoJYnl0ZSAweDZjNTI2NTY2IC8vICJsUmVmIgoJZnJhbWVfZGlnIDAgLy8gYTogU3RhdGljQXJyYXk8dWludDY0LCAzPgoJYXBwX2xvY2FsX3B1dAoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czoxMTgKCS8vIHRoaXMuYlJlZi52YWx1ZSA9IGEKCWJ5dGUgMHg2MjUyNjU2NiAvLyAiYlJlZiIKCWZyYW1lX2RpZyAwIC8vIGE6IFN0YXRpY0FycmF5PHVpbnQ2NCwgMz4KCWJveF9wdXQKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTIwCgkvLyB0aGlzLmdSZWYudmFsdWVbMV0gPSAxMTEKCWJ5dGUgMHg2NzUyNjU2NiAvLyAiZ1JlZiIKCWFwcF9nbG9iYWxfZ2V0CglieXRlIDB4MDAwMDAwMDAwMDAwMDA2ZgoJcmVwbGFjZTIgOAoJYnl0ZSAweDY3NTI2NTY2IC8vICJnUmVmIgoJc3dhcAoJYXBwX2dsb2JhbF9wdXQKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTIxCgkvLyB0aGlzLmxSZWYodGhpcy50eG4uc2VuZGVyKS52YWx1ZVsxXSA9IDIyMgoJdHhuIFNlbmRlcgoJYnl0ZSAweDZjNTI2NTY2IC8vICJsUmVmIgoJYXBwX2xvY2FsX2dldAoJYnl0ZSAweDAwMDAwMDAwMDAwMDAwZGUKCXJlcGxhY2UyIDgKCXR4biBTZW5kZXIKCWJ5dGUgMHg2YzUyNjU2NiAvLyAibFJlZiIKCXVuY292ZXIgMgoJYXBwX2xvY2FsX3B1dAoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czoxMjIKCS8vIHRoaXMuYlJlZi52YWx1ZVsxXSA9IDMzMwoJYnl0ZSAweDYyNTI2NTY2IC8vICJiUmVmIgoJaW50IDgKCWJ5dGUgMHgwMDAwMDAwMDAwMDAwMTRkCglib3hfcmVwbGFjZQoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czoxMjQKCS8vIHJldDogU3RhdGljQXJyYXk8dWludDY0LCAzPiA9IFt0aGlzLmdSZWYudmFsdWVbMV0sIHRoaXMubFJlZih0aGlzLnR4bi5zZW5kZXIpLnZhbHVlWzFdLCB0aGlzLmJSZWYudmFsdWVbMV1dCglieXRlIDB4Njc1MjY1NjYgLy8gImdSZWYiCglhcHBfZ2xvYmFsX2dldAoJZXh0cmFjdCA4IDgKCWJ0b2kKCWl0b2IKCXR4biBTZW5kZXIKCWJ5dGUgMHg2YzUyNjU2NiAvLyAibFJlZiIKCWFwcF9sb2NhbF9nZXQKCWV4dHJhY3QgOCA4CglidG9pCglpdG9iCgljb25jYXQKCWJ5dGUgMHg2MjUyNjU2NiAvLyAiYlJlZiIKCWJveF9nZXQKCWFzc2VydAoJZXh0cmFjdCA4IDgKCWJ0b2kKCWl0b2IKCWNvbmNhdAoJZnJhbWVfYnVyeSAxIC8vIHJldDogU3RhdGljQXJyYXk8dWludDY0LCAzPgoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czoxMjYKCS8vIHJldHVybiByZXQ7CglmcmFtZV9kaWcgMSAvLyByZXQ6IFN0YXRpY0FycmF5PHVpbnQ2NCwgMz4KCgkvLyBzZXQgdGhlIHN1YnJvdXRpbmUgcmV0dXJuIHZhbHVlCglmcmFtZV9idXJ5IDAKCgkvLyBwb3AgYWxsIGxvY2FsIHZhcmlhYmxlcyBmcm9tIHRoZSBzdGFjawoJcG9wbiAxCglyZXRzdWIKCmFiaV9yb3V0ZV9jcmVhdGVBcHBsaWNhdGlvbjoKCWludCAxCglyZXR1cm4KCmNyZWF0ZV9Ob09wOgoJbWV0aG9kICJjcmVhdGVBcHBsaWNhdGlvbigpdm9pZCIKCXR4bmEgQXBwbGljYXRpb25BcmdzIDAKCW1hdGNoIGFiaV9yb3V0ZV9jcmVhdGVBcHBsaWNhdGlvbgoJZXJyCgpjYWxsX09wdEluOgoJbWV0aG9kICJ1cGRhdGVTdGF0aWNBcnJheUluU3RvcmFnZVJlZigpdWludDY0WzNdIgoJdHhuYSBBcHBsaWNhdGlvbkFyZ3MgMAoJbWF0Y2ggYWJpX3JvdXRlX3VwZGF0ZVN0YXRpY0FycmF5SW5TdG9yYWdlUmVmCgllcnI=",
+    "approval": "I3ByYWdtYSB2ZXJzaW9uIDkKCi8vIFRoaXMgVEVBTCB3YXMgZ2VuZXJhdGVkIGJ5IFRFQUxTY3JpcHQgdjAuNzQuMAovLyBodHRwczovL2dpdGh1Yi5jb20vYWxnb3JhbmRmb3VuZGF0aW9uL1RFQUxTY3JpcHQKCi8vIFRoaXMgY29udHJhY3QgaXMgY29tcGxpYW50IHdpdGggYW5kL29yIGltcGxlbWVudHMgdGhlIGZvbGxvd2luZyBBUkNzOiBbIEFSQzQgXQoKLy8gVGhlIGZvbGxvd2luZyB0ZW4gbGluZXMgb2YgVEVBTCBoYW5kbGUgaW5pdGlhbCBwcm9ncmFtIGZsb3cKLy8gVGhpcyBwYXR0ZXJuIGlzIHVzZWQgdG8gbWFrZSBpdCBlYXN5IGZvciBhbnlvbmUgdG8gcGFyc2UgdGhlIHN0YXJ0IG9mIHRoZSBwcm9ncmFtIGFuZCBkZXRlcm1pbmUgaWYgYSBzcGVjaWZpYyBhY3Rpb24gaXMgYWxsb3dlZAovLyBIZXJlLCBhY3Rpb24gcmVmZXJzIHRvIHRoZSBPbkNvbXBsZXRlIGluIGNvbWJpbmF0aW9uIHdpdGggd2hldGhlciB0aGUgYXBwIGlzIGJlaW5nIGNyZWF0ZWQgb3IgY2FsbGVkCi8vIEV2ZXJ5IHBvc3NpYmxlIGFjdGlvbiBmb3IgdGhpcyBjb250cmFjdCBpcyByZXByZXNlbnRlZCBpbiB0aGUgc3dpdGNoIHN0YXRlbWVudAovLyBJZiB0aGUgYWN0aW9uIGlzIG5vdCBpbXBsbWVudGVkIGluIHRoZSBjb250cmFjdCwgaXRzIHJlc3BlY3RpdmUgYnJhbmNoIHdpbGwgYmUgIk5PVF9JTVBMRU1FTlRFRCIgd2hpY2gganVzdCBjb250YWlucyAiZXJyIgp0eG4gQXBwbGljYXRpb25JRAohCmludCA2CioKdHhuIE9uQ29tcGxldGlvbgorCnN3aXRjaCBOT1RfSU1QTEVNRU5URUQgY2FsbF9PcHRJbiBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgY3JlYXRlX05vT3AgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRAoKTk9UX0lNUExFTUVOVEVEOgoJZXJyCgphYmlfcm91dGVfdXBkYXRlU3RhdGljQXJyYXlJblN0b3JhZ2VSZWY6CgkvLyBUaGUgQUJJIHJldHVybiBwcmVmaXgKCWJ5dGUgMHgxNTFmN2M3NQoKCS8vIGV4ZWN1dGUgdXBkYXRlU3RhdGljQXJyYXlJblN0b3JhZ2VSZWYoKXVpbnQ2NFszXQoJY2FsbHN1YiB1cGRhdGVTdGF0aWNBcnJheUluU3RvcmFnZVJlZgoJY29uY2F0Cglsb2cKCWludCAxCglyZXR1cm4KCi8vIHVwZGF0ZVN0YXRpY0FycmF5SW5TdG9yYWdlUmVmKCl1aW50NjRbM10KdXBkYXRlU3RhdGljQXJyYXlJblN0b3JhZ2VSZWY6Cglwcm90byAwIDEKCgkvLyBQdXNoIGVtcHR5IGJ5dGVzIGFmdGVyIHRoZSBmcmFtZSBwb2ludGVyIHRvIHJlc2VydmUgc3BhY2UgZm9yIGxvY2FsIHZhcmlhYmxlcwoJYnl0ZSAweAoJZHVwCgoJLy8gdGVzdHMvY29udHJhY3RzL2FiaS5hbGdvLnRzOjExNAoJLy8gYTogU3RhdGljQXJyYXk8dWludDY0LCAzPiA9IFsxMSwgMjIsIDMzXQoJYnl0ZSAweDAwMDAwMDAwMDAwMDAwMGIwMDAwMDAwMDAwMDAwMDE2MDAwMDAwMDAwMDAwMDAyMQoJZnJhbWVfYnVyeSAwIC8vIGE6IFN0YXRpY0FycmF5PHVpbnQ2NCwgMz4KCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTE2CgkvLyB0aGlzLmdSZWYudmFsdWUgPSBhCglieXRlIDB4Njc1MjY1NjYgLy8gImdSZWYiCglmcmFtZV9kaWcgMCAvLyBhOiBTdGF0aWNBcnJheTx1aW50NjQsIDM+CglhcHBfZ2xvYmFsX3B1dAoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czoxMTcKCS8vIHRoaXMubFJlZih0aGlzLnR4bi5zZW5kZXIpLnZhbHVlID0gYQoJdHhuIFNlbmRlcgoJYnl0ZSAweDZjNTI2NTY2IC8vICJsUmVmIgoJZnJhbWVfZGlnIDAgLy8gYTogU3RhdGljQXJyYXk8dWludDY0LCAzPgoJYXBwX2xvY2FsX3B1dAoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czoxMTgKCS8vIHRoaXMuYlJlZi52YWx1ZSA9IGEKCWJ5dGUgMHg2MjUyNjU2NiAvLyAiYlJlZiIKCWZyYW1lX2RpZyAwIC8vIGE6IFN0YXRpY0FycmF5PHVpbnQ2NCwgMz4KCWJveF9wdXQKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTIwCgkvLyB0aGlzLmdSZWYudmFsdWVbMV0gPSAxMTEKCWJ5dGUgMHg2NzUyNjU2NiAvLyAiZ1JlZiIKCWFwcF9nbG9iYWxfZ2V0CglieXRlIDB4MDAwMDAwMDAwMDAwMDA2ZgoJcmVwbGFjZTIgOAoJYnl0ZSAweDY3NTI2NTY2IC8vICJnUmVmIgoJc3dhcAoJYXBwX2dsb2JhbF9wdXQKCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTIxCgkvLyB0aGlzLmxSZWYodGhpcy50eG4uc2VuZGVyKS52YWx1ZVsxXSA9IDIyMgoJdHhuIFNlbmRlcgoJYnl0ZSAweDZjNTI2NTY2IC8vICJsUmVmIgoJYXBwX2xvY2FsX2dldAoJYnl0ZSAweDAwMDAwMDAwMDAwMDAwZGUKCXJlcGxhY2UyIDgKCXR4biBTZW5kZXIKCWJ5dGUgMHg2YzUyNjU2NiAvLyAibFJlZiIKCXVuY292ZXIgMgoJYXBwX2xvY2FsX3B1dAoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czoxMjIKCS8vIHRoaXMuYlJlZi52YWx1ZVsxXSA9IDMzMwoJYnl0ZSAweDYyNTI2NTY2IC8vICJiUmVmIgoJaW50IDgKCWJ5dGUgMHgwMDAwMDAwMDAwMDAwMTRkCglib3hfcmVwbGFjZQoKCS8vIHRlc3RzL2NvbnRyYWN0cy9hYmkuYWxnby50czoxMjQKCS8vIHJldDogU3RhdGljQXJyYXk8dWludDY0LCAzPiA9IFt0aGlzLmdSZWYudmFsdWVbMV0sIHRoaXMubFJlZih0aGlzLnR4bi5zZW5kZXIpLnZhbHVlWzFdLCB0aGlzLmJSZWYudmFsdWVbMV1dCglieXRlIDB4Njc1MjY1NjYgLy8gImdSZWYiCglhcHBfZ2xvYmFsX2dldAoJZXh0cmFjdCA4IDgKCWJ0b2kKCWl0b2IKCXR4biBTZW5kZXIKCWJ5dGUgMHg2YzUyNjU2NiAvLyAibFJlZiIKCWFwcF9sb2NhbF9nZXQKCWV4dHJhY3QgOCA4CglidG9pCglpdG9iCgljb25jYXQKCWJ5dGUgMHg2MjUyNjU2NiAvLyAiYlJlZiIKCWludCA4CglkdXAKCWJveF9leHRyYWN0CglidG9pCglpdG9iCgljb25jYXQKCWZyYW1lX2J1cnkgMSAvLyByZXQ6IFN0YXRpY0FycmF5PHVpbnQ2NCwgMz4KCgkvLyB0ZXN0cy9jb250cmFjdHMvYWJpLmFsZ28udHM6MTI2CgkvLyByZXR1cm4gcmV0OwoJZnJhbWVfZGlnIDEgLy8gcmV0OiBTdGF0aWNBcnJheTx1aW50NjQsIDM+CgoJLy8gc2V0IHRoZSBzdWJyb3V0aW5lIHJldHVybiB2YWx1ZQoJZnJhbWVfYnVyeSAwCgoJLy8gcG9wIGFsbCBsb2NhbCB2YXJpYWJsZXMgZnJvbSB0aGUgc3RhY2sKCXBvcG4gMQoJcmV0c3ViCgphYmlfcm91dGVfY3JlYXRlQXBwbGljYXRpb246CglpbnQgMQoJcmV0dXJuCgpjcmVhdGVfTm9PcDoKCW1ldGhvZCAiY3JlYXRlQXBwbGljYXRpb24oKXZvaWQiCgl0eG5hIEFwcGxpY2F0aW9uQXJncyAwCgltYXRjaCBhYmlfcm91dGVfY3JlYXRlQXBwbGljYXRpb24KCWVycgoKY2FsbF9PcHRJbjoKCW1ldGhvZCAidXBkYXRlU3RhdGljQXJyYXlJblN0b3JhZ2VSZWYoKXVpbnQ2NFszXSIKCXR4bmEgQXBwbGljYXRpb25BcmdzIDAKCW1hdGNoIGFiaV9yb3V0ZV91cGRhdGVTdGF0aWNBcnJheUluU3RvcmFnZVJlZgoJZXJy",
     "clear": "I3ByYWdtYSB2ZXJzaW9uIDk="
   },
   "contract": {
diff --git a/tests/contracts/artifacts/ABITestUpdateStringInTuple.approval.teal b/tests/contracts/artifacts/ABITestUpdateStringInTuple.approval.teal
index cf39c31d5..146915a24 100644
--- a/tests/contracts/artifacts/ABITestUpdateStringInTuple.approval.teal
+++ b/tests/contracts/artifacts/ABITestUpdateStringInTuple.approval.teal
@@ -63,9 +63,8 @@ updateStringInTuple:
 	frame_dig 0 // a: [uint<8>, uint16[], string, uint16[], uint<8>[]]
 	store 255 // full array
 	load 255 // full array
-	int 0
 	byte 0x63
-	replace3
+	replace2 0
 	frame_bury 0 // a: [uint<8>, uint16[], string, uint16[], uint<8>[]]
 
 	// tests/contracts/abi.algo.ts:563
diff --git a/tests/contracts/artifacts/ABITestUpdateStringInTuple.arc32.json b/tests/contracts/artifacts/ABITestUpdateStringInTuple.arc32.json
index 7b9cc4283..e4caa278d 100644
--- a/tests/contracts/artifacts/ABITestUpdateStringInTuple.arc32.json
+++ b/tests/contracts/artifacts/ABITestUpdateStringInTuple.arc32.json
@@ -39,7 +39,7 @@
     }
   },
   "source": {
-    "approval": "#pragma version 9

// This TEAL was generated by TEALScript v0.74.0
// https://github.com/algorandfoundation/TEALScript

// This contract is compliant with and/or implements the following ARCs: [ ARC4 ]

// The following ten lines of TEAL handle initial program flow
// This pattern is used to make it easy for anyone to parse the start of the program and determine if a specific action is allowed
// Here, action refers to the OnComplete in combination with whether the app is being created or called
// Every possible action for this contract is represented in the switch statement
// If the action is not implmented in the contract, its respective branch will be "NOT_IMPLEMENTED" which just contains "err"
txn ApplicationID
!
int 6
*
txn OnCompletion
+
switch call_NoOp NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED create_NoOp NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED

NOT_IMPLEMENTED:
	err

abi_route_updateStringInTuple:
	// The ABI return prefix
	byte 0x151f7c75

	// execute updateStringInTuple()(uint8,uint16[],string,uint16[],uint8[])
	callsub updateStringInTuple
	concat
	log
	int 1
	return

// updateStringInTuple()(uint8,uint16[],string,uint16[],uint8[])
updateStringInTuple:
	proto 0 1

	// Push empty bytes after the frame pointer to reserve space for local variables
	byte 0x

	// tests/contracts/abi.algo.ts:560
	// a: [uint<8>, uint16[], string, uint16[], uint<8>[]] = [9, [8], 'Hi?', [6], [5]]
	byte 0x // initial head
	byte 0x // initial tail
	byte 0x0009 // initial head offset
	byte 0x09
	callsub process_static_tuple_element
	byte 0x00010008
	callsub process_dynamic_tuple_element
	byte 0x000348693f
	callsub process_dynamic_tuple_element
	byte 0x00010006
	callsub process_dynamic_tuple_element
	byte 0x000105
	callsub process_dynamic_tuple_element
	pop // pop head offset
	concat // concat head and tail
	frame_bury 0 // a: [uint<8>, uint16[], string, uint16[], uint<8>[]]

	// tests/contracts/abi.algo.ts:562
	// a[0] = 99 as uint<8>
	frame_dig 0 // a: [uint<8>, uint16[], string, uint16[], uint<8>[]]
	store 255 // full array
	load 255 // full array
	int 0
	byte 0x63
	replace3
	frame_bury 0 // a: [uint<8>, uint16[], string, uint16[], uint<8>[]]

	// tests/contracts/abi.algo.ts:563
	// a[1] = [10, 11]
	frame_dig 0 // a: [uint<8>, uint16[], string, uint16[], uint<8>[]]
	store 255 // full array
	int 1
	dup
	store 251 // element head offset
	load 255 // full array
	load 255 // full array
	uncover 2
	extract_uint16
	dup
	store 254 // element start
	dup // duplicate start of element
	load 255 // full array
	swap
	extract_uint16 // get number of elements
	int 2 // get type length
	* // multiply by type length
	int 2
	+ // add two for length
	store 253 // element length
	load 255 // full array
	int 0
	load 254 // element start
	substring3
	byte 0x0002000a000b
	dup
	store 252 // new element
	load 255 // full array
	load 254 // element start
	load 253 // element length
	+ // get end of Element
	load 255 // full array
	len
	substring3
	concat
	concat
	store 255 // full array
	callsub get_length_difference
	load 250 // length difference
	load 251 // element head offset
	int 2
	+ // head ofset
	callsub update_dynamic_head
	load 250 // length difference
	load 251 // element head offset
	int 4
	+ // head ofset
	callsub update_dynamic_head
	load 250 // length difference
	load 251 // element head offset
	int 6
	+ // head ofset
	callsub update_dynamic_head
	load 255 // full array
	frame_bury 0 // a: [uint<8>, uint16[], string, uint16[], uint<8>[]]

	// tests/contracts/abi.algo.ts:564
	// a[2] = 'Hello World!'
	frame_dig 0 // a: [uint<8>, uint16[], string, uint16[], uint<8>[]]
	store 255 // full array
	int 3
	dup
	store 251 // element head offset
	load 255 // full array
	load 255 // full array
	uncover 2
	extract_uint16
	dup
	store 254 // element start
	dup // duplicate start of element
	load 255 // full array
	swap
	extract_uint16 // get number of elements
	int 1 // get type length
	* // multiply by type length
	int 2
	+ // add two for length
	store 253 // element length
	load 255 // full array
	int 0
	load 254 // element start
	substring3
	byte 0x000c48656c6c6f20576f726c6421
	dup
	store 252 // new element
	load 255 // full array
	load 254 // element start
	load 253 // element length
	+ // get end of Element
	load 255 // full array
	len
	substring3
	concat
	concat
	store 255 // full array
	callsub get_length_difference
	load 250 // length difference
	load 251 // element head offset
	int 2
	+ // head ofset
	callsub update_dynamic_head
	load 250 // length difference
	load 251 // element head offset
	int 4
	+ // head ofset
	callsub update_dynamic_head
	load 255 // full array
	frame_bury 0 // a: [uint<8>, uint16[], string, uint16[], uint<8>[]]

	// tests/contracts/abi.algo.ts:565
	// a[3] = [14, 15]
	frame_dig 0 // a: [uint<8>, uint16[], string, uint16[], uint<8>[]]
	store 255 // full array
	int 5
	dup
	store 251 // element head offset
	load 255 // full array
	load 255 // full array
	uncover 2
	extract_uint16
	dup
	store 254 // element start
	dup // duplicate start of element
	load 255 // full array
	swap
	extract_uint16 // get number of elements
	int 2 // get type length
	* // multiply by type length
	int 2
	+ // add two for length
	store 253 // element length
	load 255 // full array
	int 0
	load 254 // element start
	substring3
	byte 0x0002000e000f
	dup
	store 252 // new element
	load 255 // full array
	load 254 // element start
	load 253 // element length
	+ // get end of Element
	load 255 // full array
	len
	substring3
	concat
	concat
	store 255 // full array
	callsub get_length_difference
	load 250 // length difference
	load 251 // element head offset
	int 2
	+ // head ofset
	callsub update_dynamic_head
	load 255 // full array
	frame_bury 0 // a: [uint<8>, uint16[], string, uint16[], uint<8>[]]

	// tests/contracts/abi.algo.ts:566
	// a[4] = [16, 17]
	frame_dig 0 // a: [uint<8>, uint16[], string, uint16[], uint<8>[]]
	store 255 // full array
	int 7
	dup
	store 251 // element head offset
	load 255 // full array
	load 255 // full array
	uncover 2
	extract_uint16
	dup
	store 254 // element start
	dup // duplicate start of element
	load 255 // full array
	swap
	extract_uint16 // get number of elements
	int 1 // get type length
	* // multiply by type length
	int 2
	+ // add two for length
	store 253 // element length
	load 255 // full array
	int 0
	load 254 // element start
	substring3
	byte 0x00021011
	dup
	store 252 // new element
	load 255 // full array
	load 254 // element start
	load 253 // element length
	+ // get end of Element
	load 255 // full array
	len
	substring3
	concat
	concat
	store 255 // full array
	callsub get_length_difference
	load 255 // full array
	frame_bury 0 // a: [uint<8>, uint16[], string, uint16[], uint<8>[]]

	// tests/contracts/abi.algo.ts:568
	// return a;
	frame_dig 0 // a: [uint<8>, uint16[], string, uint16[], uint<8>[]]

	// set the subroutine return value
	frame_bury 0
	retsub

abi_route_createApplication:
	int 1
	return

create_NoOp:
	method "createApplication()void"
	txna ApplicationArgs 0
	match abi_route_createApplication
	err

call_NoOp:
	method "updateStringInTuple()(uint8,uint16[],string,uint16[],uint8[])"
	txna ApplicationArgs 0
	match abi_route_updateStringInTuple
	err

process_static_tuple_element:
	proto 4 3
	frame_dig -4 // tuple head
	frame_dig -1 // element
	concat
	frame_dig -3 // tuple tail
	frame_dig -2 // head offset
	retsub

process_dynamic_tuple_element:
	proto 4 3
	frame_dig -4 // tuple head
	frame_dig -2 // head offset
	concat
	frame_bury -4 // tuple head
	frame_dig -1 // element
	dup
	len
	frame_dig -2 // head offset
	btoi
	+
	itob
	extract 6 2
	frame_bury -2 // head offset
	frame_dig -3 // tuple tail
	swap
	concat
	frame_bury -3 // tuple tail
	frame_dig -4 // tuple head
	frame_dig -3 // tuple tail
	frame_dig -2 // head offset
	retsub

update_dynamic_head:
	proto 2 0
	frame_dig -2 // length difference
	load 255 // full array
	frame_dig -1 // dynamic array offset
	extract_uint16 // extract dynamic array offset
	load 249 // subtract head difference
	bz subtract_head_difference
	+ // add difference to offset
	b end_calc_new_head

subtract_head_difference:
	swap
	- // subtract difference from offet

end_calc_new_head:
	itob // convert to bytes
	extract 6 2 // convert to uint16
	load 255 // full array
	swap
	frame_dig -1 // offset
	swap
	replace3 // update offset
	store 255 // full array
	retsub

get_length_difference:
	load 252 // new element
	len // length of new element
	load 253 // element length
	<
	bnz swapped_difference
	load 252 // new element
	len // length of new element
	load 253 // element length
	int 1
	store 249 // subtract head difference
	b get_difference

swapped_difference:
	load 253 // element length
	load 252 // new element
	len // length of new element
	int 0
	store 249 // subtract head difference

get_difference:
	- // get length difference
	store 250 // length difference
	retsub",
+    "approval": "#pragma version 9

// This TEAL was generated by TEALScript v0.74.0
// https://github.com/algorandfoundation/TEALScript

// This contract is compliant with and/or implements the following ARCs: [ ARC4 ]

// The following ten lines of TEAL handle initial program flow
// This pattern is used to make it easy for anyone to parse the start of the program and determine if a specific action is allowed
// Here, action refers to the OnComplete in combination with whether the app is being created or called
// Every possible action for this contract is represented in the switch statement
// If the action is not implmented in the contract, its respective branch will be "NOT_IMPLEMENTED" which just contains "err"
txn ApplicationID
!
int 6
*
txn OnCompletion
+
switch call_NoOp NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED create_NoOp NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED

NOT_IMPLEMENTED:
	err

abi_route_updateStringInTuple:
	// The ABI return prefix
	byte 0x151f7c75

	// execute updateStringInTuple()(uint8,uint16[],string,uint16[],uint8[])
	callsub updateStringInTuple
	concat
	log
	int 1
	return

// updateStringInTuple()(uint8,uint16[],string,uint16[],uint8[])
updateStringInTuple:
	proto 0 1

	// Push empty bytes after the frame pointer to reserve space for local variables
	byte 0x

	// tests/contracts/abi.algo.ts:560
	// a: [uint<8>, uint16[], string, uint16[], uint<8>[]] = [9, [8], 'Hi?', [6], [5]]
	byte 0x // initial head
	byte 0x // initial tail
	byte 0x0009 // initial head offset
	byte 0x09
	callsub process_static_tuple_element
	byte 0x00010008
	callsub process_dynamic_tuple_element
	byte 0x000348693f
	callsub process_dynamic_tuple_element
	byte 0x00010006
	callsub process_dynamic_tuple_element
	byte 0x000105
	callsub process_dynamic_tuple_element
	pop // pop head offset
	concat // concat head and tail
	frame_bury 0 // a: [uint<8>, uint16[], string, uint16[], uint<8>[]]

	// tests/contracts/abi.algo.ts:562
	// a[0] = 99 as uint<8>
	frame_dig 0 // a: [uint<8>, uint16[], string, uint16[], uint<8>[]]
	store 255 // full array
	load 255 // full array
	byte 0x63
	replace2 0
	frame_bury 0 // a: [uint<8>, uint16[], string, uint16[], uint<8>[]]

	// tests/contracts/abi.algo.ts:563
	// a[1] = [10, 11]
	frame_dig 0 // a: [uint<8>, uint16[], string, uint16[], uint<8>[]]
	store 255 // full array
	int 1
	dup
	store 251 // element head offset
	load 255 // full array
	load 255 // full array
	uncover 2
	extract_uint16
	dup
	store 254 // element start
	dup // duplicate start of element
	load 255 // full array
	swap
	extract_uint16 // get number of elements
	int 2 // get type length
	* // multiply by type length
	int 2
	+ // add two for length
	store 253 // element length
	load 255 // full array
	int 0
	load 254 // element start
	substring3
	byte 0x0002000a000b
	dup
	store 252 // new element
	load 255 // full array
	load 254 // element start
	load 253 // element length
	+ // get end of Element
	load 255 // full array
	len
	substring3
	concat
	concat
	store 255 // full array
	callsub get_length_difference
	load 250 // length difference
	load 251 // element head offset
	int 2
	+ // head ofset
	callsub update_dynamic_head
	load 250 // length difference
	load 251 // element head offset
	int 4
	+ // head ofset
	callsub update_dynamic_head
	load 250 // length difference
	load 251 // element head offset
	int 6
	+ // head ofset
	callsub update_dynamic_head
	load 255 // full array
	frame_bury 0 // a: [uint<8>, uint16[], string, uint16[], uint<8>[]]

	// tests/contracts/abi.algo.ts:564
	// a[2] = 'Hello World!'
	frame_dig 0 // a: [uint<8>, uint16[], string, uint16[], uint<8>[]]
	store 255 // full array
	int 3
	dup
	store 251 // element head offset
	load 255 // full array
	load 255 // full array
	uncover 2
	extract_uint16
	dup
	store 254 // element start
	dup // duplicate start of element
	load 255 // full array
	swap
	extract_uint16 // get number of elements
	int 1 // get type length
	* // multiply by type length
	int 2
	+ // add two for length
	store 253 // element length
	load 255 // full array
	int 0
	load 254 // element start
	substring3
	byte 0x000c48656c6c6f20576f726c6421
	dup
	store 252 // new element
	load 255 // full array
	load 254 // element start
	load 253 // element length
	+ // get end of Element
	load 255 // full array
	len
	substring3
	concat
	concat
	store 255 // full array
	callsub get_length_difference
	load 250 // length difference
	load 251 // element head offset
	int 2
	+ // head ofset
	callsub update_dynamic_head
	load 250 // length difference
	load 251 // element head offset
	int 4
	+ // head ofset
	callsub update_dynamic_head
	load 255 // full array
	frame_bury 0 // a: [uint<8>, uint16[], string, uint16[], uint<8>[]]

	// tests/contracts/abi.algo.ts:565
	// a[3] = [14, 15]
	frame_dig 0 // a: [uint<8>, uint16[], string, uint16[], uint<8>[]]
	store 255 // full array
	int 5
	dup
	store 251 // element head offset
	load 255 // full array
	load 255 // full array
	uncover 2
	extract_uint16
	dup
	store 254 // element start
	dup // duplicate start of element
	load 255 // full array
	swap
	extract_uint16 // get number of elements
	int 2 // get type length
	* // multiply by type length
	int 2
	+ // add two for length
	store 253 // element length
	load 255 // full array
	int 0
	load 254 // element start
	substring3
	byte 0x0002000e000f
	dup
	store 252 // new element
	load 255 // full array
	load 254 // element start
	load 253 // element length
	+ // get end of Element
	load 255 // full array
	len
	substring3
	concat
	concat
	store 255 // full array
	callsub get_length_difference
	load 250 // length difference
	load 251 // element head offset
	int 2
	+ // head ofset
	callsub update_dynamic_head
	load 255 // full array
	frame_bury 0 // a: [uint<8>, uint16[], string, uint16[], uint<8>[]]

	// tests/contracts/abi.algo.ts:566
	// a[4] = [16, 17]
	frame_dig 0 // a: [uint<8>, uint16[], string, uint16[], uint<8>[]]
	store 255 // full array
	int 7
	dup
	store 251 // element head offset
	load 255 // full array
	load 255 // full array
	uncover 2
	extract_uint16
	dup
	store 254 // element start
	dup // duplicate start of element
	load 255 // full array
	swap
	extract_uint16 // get number of elements
	int 1 // get type length
	* // multiply by type length
	int 2
	+ // add two for length
	store 253 // element length
	load 255 // full array
	int 0
	load 254 // element start
	substring3
	byte 0x00021011
	dup
	store 252 // new element
	load 255 // full array
	load 254 // element start
	load 253 // element length
	+ // get end of Element
	load 255 // full array
	len
	substring3
	concat
	concat
	store 255 // full array
	callsub get_length_difference
	load 255 // full array
	frame_bury 0 // a: [uint<8>, uint16[], string, uint16[], uint<8>[]]

	// tests/contracts/abi.algo.ts:568
	// return a;
	frame_dig 0 // a: [uint<8>, uint16[], string, uint16[], uint<8>[]]

	// set the subroutine return value
	frame_bury 0
	retsub

abi_route_createApplication:
	int 1
	return

create_NoOp:
	method "createApplication()void"
	txna ApplicationArgs 0
	match abi_route_createApplication
	err

call_NoOp:
	method "updateStringInTuple()(uint8,uint16[],string,uint16[],uint8[])"
	txna ApplicationArgs 0
	match abi_route_updateStringInTuple
	err

process_static_tuple_element:
	proto 4 3
	frame_dig -4 // tuple head
	frame_dig -1 // element
	concat
	frame_dig -3 // tuple tail
	frame_dig -2 // head offset
	retsub

process_dynamic_tuple_element:
	proto 4 3
	frame_dig -4 // tuple head
	frame_dig -2 // head offset
	concat
	frame_bury -4 // tuple head
	frame_dig -1 // element
	dup
	len
	frame_dig -2 // head offset
	btoi
	+
	itob
	extract 6 2
	frame_bury -2 // head offset
	frame_dig -3 // tuple tail
	swap
	concat
	frame_bury -3 // tuple tail
	frame_dig -4 // tuple head
	frame_dig -3 // tuple tail
	frame_dig -2 // head offset
	retsub

update_dynamic_head:
	proto 2 0
	frame_dig -2 // length difference
	load 255 // full array
	frame_dig -1 // dynamic array offset
	extract_uint16 // extract dynamic array offset
	load 249 // subtract head difference
	bz subtract_head_difference
	+ // add difference to offset
	b end_calc_new_head

subtract_head_difference:
	swap
	- // subtract difference from offet

end_calc_new_head:
	itob // convert to bytes
	extract 6 2 // convert to uint16
	load 255 // full array
	swap
	frame_dig -1 // offset
	swap
	replace3 // update offset
	store 255 // full array
	retsub

get_length_difference:
	load 252 // new element
	len // length of new element
	load 253 // element length
	<
	bnz swapped_difference
	load 252 // new element
	len // length of new element
	load 253 // element length
	int 1
	store 249 // subtract head difference
	b get_difference

swapped_difference:
	load 253 // element length
	load 252 // new element
	len // length of new element
	int 0
	store 249 // subtract head difference

get_difference:
	- // get length difference
	store 250 // length difference
	retsub",
     "clear": "I3ByYWdtYSB2ZXJzaW9uIDk="
   },
   "contract": {
diff --git a/tests/contracts/artifacts/StorageTest.approval.teal b/tests/contracts/artifacts/StorageTest.approval.teal
index c5c2f6394..8c073c5d6 100644
--- a/tests/contracts/artifacts/StorageTest.approval.teal
+++ b/tests/contracts/artifacts/StorageTest.approval.teal
@@ -31,7 +31,7 @@ abi_route_prefix:
 prefix:
 	proto 0 0
 
-	// tests/contracts/storage.algo.ts:24
+	// tests/contracts/storage.algo.ts:26
 	// this.boxMapWithPrefix('oo').value = 'bar'
 	byte 0x666f6f
 	dup
@@ -40,13 +40,13 @@ prefix:
 	byte 0x626172 // "bar"
 	box_put
 
-	// tests/contracts/storage.algo.ts:25
+	// tests/contracts/storage.algo.ts:27
 	// this.globalMapWithPrefix('oo').value = 'bar'
 	byte 0x666f6f
 	byte 0x626172 // "bar"
 	app_global_put
 
-	// tests/contracts/storage.algo.ts:26
+	// tests/contracts/storage.algo.ts:28
 	// this.localMapWithPrefix(this.txn.sender, 'oo').value = 'bar'
 	txn Sender
 	byte 0x666f6f
@@ -64,7 +64,7 @@ abi_route_globalKeyPut:
 globalKeyPut:
 	proto 0 0
 
-	// tests/contracts/storage.algo.ts:30
+	// tests/contracts/storage.algo.ts:32
 	// this.globalKey.value = 'bar'
 	byte 0x666f6f // "foo"
 	byte 0x626172 // "bar"
@@ -81,7 +81,7 @@ abi_route_globalKeyGet:
 globalKeyGet:
 	proto 0 0
 
-	// tests/contracts/storage.algo.ts:34
+	// tests/contracts/storage.algo.ts:36
 	// assert(this.globalKey.value === 'bar')
 	byte 0x666f6f // "foo"
 	app_global_get
@@ -100,7 +100,7 @@ abi_route_globalKeyDelete:
 globalKeyDelete:
 	proto 0 0
 
-	// tests/contracts/storage.algo.ts:38
+	// tests/contracts/storage.algo.ts:40
 	// this.globalKey.delete()
 	byte 0x666f6f // "foo"
 	app_global_del
@@ -116,7 +116,7 @@ abi_route_globalKeyExists:
 globalKeyExists:
 	proto 0 0
 
-	// tests/contracts/storage.algo.ts:42
+	// tests/contracts/storage.algo.ts:44
 	// assert(this.globalKey.exists)
 	txna Applications 0
 	byte 0x666f6f // "foo"
@@ -141,7 +141,7 @@ abi_route_localKeyPut:
 localKeyPut:
 	proto 1 0
 
-	// tests/contracts/storage.algo.ts:46
+	// tests/contracts/storage.algo.ts:48
 	// this.localKey(a).value = 'bar'
 	frame_dig -1 // a: Account
 	byte 0x666f6f // "foo"
@@ -164,7 +164,7 @@ abi_route_localKeyGet:
 localKeyGet:
 	proto 1 0
 
-	// tests/contracts/storage.algo.ts:50
+	// tests/contracts/storage.algo.ts:52
 	// assert(this.localKey(a).value === 'bar')
 	frame_dig -1 // a: Account
 	byte 0x666f6f // "foo"
@@ -189,7 +189,7 @@ abi_route_localKeyDelete:
 localKeyDelete:
 	proto 1 0
 
-	// tests/contracts/storage.algo.ts:54
+	// tests/contracts/storage.algo.ts:56
 	// this.localKey(a).delete()
 	frame_dig -1 // a: Account
 	byte 0x666f6f // "foo"
@@ -211,7 +211,7 @@ abi_route_localKeyExists:
 localKeyExists:
 	proto 1 0
 
-	// tests/contracts/storage.algo.ts:58
+	// tests/contracts/storage.algo.ts:60
 	// assert(this.localKey(a).exists)
 	frame_dig -1 // a: Account
 	txna Applications 0
@@ -232,7 +232,7 @@ abi_route_boxKeyPut:
 boxKeyPut:
 	proto 0 0
 
-	// tests/contracts/storage.algo.ts:62
+	// tests/contracts/storage.algo.ts:64
 	// this.boxKey.value = 'bar'
 	byte 0x666f6f // "foo"
 	byte 0x626172 // "bar"
@@ -249,7 +249,7 @@ abi_route_boxKeyGet:
 boxKeyGet:
 	proto 0 0
 
-	// tests/contracts/storage.algo.ts:66
+	// tests/contracts/storage.algo.ts:68
 	// assert(this.boxKey.value === 'bar')
 	byte 0x666f6f // "foo"
 	box_get
@@ -269,7 +269,7 @@ abi_route_boxKeyDelete:
 boxKeyDelete:
 	proto 0 0
 
-	// tests/contracts/storage.algo.ts:70
+	// tests/contracts/storage.algo.ts:72
 	// this.boxKey.delete()
 	byte 0x666f6f // "foo"
 	box_del
@@ -285,7 +285,7 @@ abi_route_boxKeyExists:
 boxKeyExists:
 	proto 0 0
 
-	// tests/contracts/storage.algo.ts:74
+	// tests/contracts/storage.algo.ts:76
 	// assert(this.boxKey.exists)
 	byte 0x666f6f // "foo"
 	box_len
@@ -304,7 +304,7 @@ abi_route_globalMapPut:
 globalMapPut:
 	proto 0 0
 
-	// tests/contracts/storage.algo.ts:78
+	// tests/contracts/storage.algo.ts:80
 	// this.globalMap('foo').value = 'bar'
 	byte 0x666f6f // "foo"
 	byte 0x626172 // "bar"
@@ -321,7 +321,7 @@ abi_route_globalMapGet:
 globalMapGet:
 	proto 0 0
 
-	// tests/contracts/storage.algo.ts:82
+	// tests/contracts/storage.algo.ts:84
 	// assert(this.globalMap('foo').value === 'bar')
 	byte 0x666f6f // "foo"
 	app_global_get
@@ -340,7 +340,7 @@ abi_route_globalMapDelete:
 globalMapDelete:
 	proto 0 0
 
-	// tests/contracts/storage.algo.ts:86
+	// tests/contracts/storage.algo.ts:88
 	// this.globalMap('foo').delete()
 	byte 0x666f6f // "foo"
 	app_global_del
@@ -356,7 +356,7 @@ abi_route_globalMapExists:
 globalMapExists:
 	proto 0 0
 
-	// tests/contracts/storage.algo.ts:90
+	// tests/contracts/storage.algo.ts:92
 	// assert(this.globalMap('foo').exists)
 	txna Applications 0
 	byte 0x666f6f // "foo"
@@ -381,7 +381,7 @@ abi_route_localMapPut:
 localMapPut:
 	proto 1 0
 
-	// tests/contracts/storage.algo.ts:94
+	// tests/contracts/storage.algo.ts:96
 	// this.localMap(a, 'foo').value = 'bar'
 	frame_dig -1 // a: Account
 	byte 0x666f6f // "foo"
@@ -404,7 +404,7 @@ abi_route_localMapGet:
 localMapGet:
 	proto 1 0
 
-	// tests/contracts/storage.algo.ts:98
+	// tests/contracts/storage.algo.ts:100
 	// assert(this.localMap(a, 'foo').value === 'bar')
 	frame_dig -1 // a: Account
 	byte 0x666f6f // "foo"
@@ -429,7 +429,7 @@ abi_route_localMapDelete:
 localMapDelete:
 	proto 1 0
 
-	// tests/contracts/storage.algo.ts:102
+	// tests/contracts/storage.algo.ts:104
 	// this.localMap(a, 'foo').delete()
 	frame_dig -1 // a: Account
 	byte 0x666f6f // "foo"
@@ -451,7 +451,7 @@ abi_route_localMapExists:
 localMapExists:
 	proto 1 0
 
-	// tests/contracts/storage.algo.ts:106
+	// tests/contracts/storage.algo.ts:108
 	// assert(this.localMap(a, 'foo').exists)
 	frame_dig -1 // a: Account
 	txna Applications 0
@@ -472,7 +472,7 @@ abi_route_boxMapPut:
 boxMapPut:
 	proto 0 0
 
-	// tests/contracts/storage.algo.ts:110
+	// tests/contracts/storage.algo.ts:112
 	// this.boxMap('foo').value = 'bar'
 	byte 0x666f6f // "foo"
 	byte 0x626172 // "bar"
@@ -489,7 +489,7 @@ abi_route_boxMapGet:
 boxMapGet:
 	proto 0 0
 
-	// tests/contracts/storage.algo.ts:114
+	// tests/contracts/storage.algo.ts:116
 	// assert(this.boxMap('foo').value === 'bar')
 	byte 0x666f6f // "foo"
 	box_get
@@ -509,7 +509,7 @@ abi_route_boxMapDelete:
 boxMapDelete:
 	proto 0 0
 
-	// tests/contracts/storage.algo.ts:118
+	// tests/contracts/storage.algo.ts:120
 	// this.boxMap('foo').delete()
 	byte 0x666f6f // "foo"
 	box_del
@@ -525,7 +525,7 @@ abi_route_boxMapExists:
 boxMapExists:
 	proto 0 0
 
-	// tests/contracts/storage.algo.ts:122
+	// tests/contracts/storage.algo.ts:124
 	// assert(this.boxMap('foo').exists)
 	byte 0x666f6f // "foo"
 	box_len
@@ -544,11 +544,12 @@ abi_route_boxKeyCreate:
 boxKeyCreate:
 	proto 0 0
 
-	// tests/contracts/storage.algo.ts:126
+	// tests/contracts/storage.algo.ts:128
 	// this.boxKey.create(1024)
 	byte 0x666f6f // "foo"
 	int 1024
 	box_create
+	pop
 	retsub
 
 abi_route_boxMapCreate:
@@ -561,11 +562,12 @@ abi_route_boxMapCreate:
 boxMapCreate:
 	proto 0 0
 
-	// tests/contracts/storage.algo.ts:130
+	// tests/contracts/storage.algo.ts:132
 	// this.boxMap('bar').create(1024)
 	byte 0x626172 // "bar"
 	int 1024
 	box_create
+	pop
 	retsub
 
 abi_route_boxKeyLength:
@@ -584,7 +586,7 @@ abi_route_boxKeyLength:
 boxKeyLength:
 	proto 0 1
 
-	// tests/contracts/storage.algo.ts:134
+	// tests/contracts/storage.algo.ts:136
 	// return this.boxKey.size;
 	byte 0x666f6f // "foo"
 	box_len
@@ -607,7 +609,7 @@ abi_route_boxMapLength:
 boxMapLength:
 	proto 0 1
 
-	// tests/contracts/storage.algo.ts:138
+	// tests/contracts/storage.algo.ts:140
 	// return this.boxMap('bar').size;
 	byte 0x626172 // "bar"
 	box_len
@@ -624,7 +626,7 @@ abi_route_boxKeyReplace:
 boxKeyReplace:
 	proto 0 0
 
-	// tests/contracts/storage.algo.ts:142
+	// tests/contracts/storage.algo.ts:144
 	// this.boxKey.replace(0, 'abc')
 	byte 0x666f6f // "foo"
 	int 0
@@ -642,7 +644,7 @@ abi_route_boxMapReplace:
 boxMapReplace:
 	proto 0 0
 
-	// tests/contracts/storage.algo.ts:146
+	// tests/contracts/storage.algo.ts:148
 	// this.boxMap('bar').replace(0, 'abc')
 	byte 0x626172 // "bar"
 	int 0
@@ -671,7 +673,7 @@ abi_route_boxKeyExtract:
 boxKeyExtract:
 	proto 0 1
 
-	// tests/contracts/storage.algo.ts:150
+	// tests/contracts/storage.algo.ts:152
 	// return this.boxKey.extract(0, 3);
 	byte 0x666f6f // "foo"
 	int 0
@@ -700,7 +702,7 @@ abi_route_boxMapExtract:
 boxMapExtract:
 	proto 0 1
 
-	// tests/contracts/storage.algo.ts:154
+	// tests/contracts/storage.algo.ts:156
 	// return this.boxMap('bar').extract(0, 3);
 	byte 0x626172 // "bar"
 	int 0
@@ -727,7 +729,7 @@ abi_route_isOptedIn:
 isOptedIn:
 	proto 0 1
 
-	// tests/contracts/storage.algo.ts:158
+	// tests/contracts/storage.algo.ts:160
 	// return this.txn.sender.isOptedInToApp(this.app);
 	txn Sender
 	txna Applications 0
@@ -744,7 +746,7 @@ abi_route_exGlobal:
 exGlobal:
 	proto 0 0
 
-	// tests/contracts/storage.algo.ts:162
+	// tests/contracts/storage.algo.ts:164
 	// log(this.app.globalState('foo') as bytes)
 	txna Applications 0
 	byte 0x666f6f // "foo"
@@ -763,7 +765,7 @@ abi_route_exLocal:
 exLocal:
 	proto 0 0
 
-	// tests/contracts/storage.algo.ts:166
+	// tests/contracts/storage.algo.ts:168
 	// log(this.app.localState(this.txn.sender, 'foo') as bytes)
 	txn Sender
 	txna Applications 0
@@ -773,6 +775,106 @@ exLocal:
 	log
 	retsub
 
+abi_route_accessStaticValueInLargeBox:
+	// The ABI return prefix
+	byte 0x151f7c75
+
+	// execute accessStaticValueInLargeBox()uint16
+	callsub accessStaticValueInLargeBox
+	itob
+	dup
+	bitlen
+	int 16
+	<=
+	assert
+	extract 6 2
+	concat
+	log
+	int 1
+	return
+
+// accessStaticValueInLargeBox()uint16
+accessStaticValueInLargeBox:
+	proto 0 1
+
+	// tests/contracts/storage.algo.ts:172
+	// this.largeStaticArrayInBox.create()
+	byte 0x6c617267655374617469634172726179496e426f78 // "largeStaticArrayInBox"
+	int 8000
+	box_create
+	pop
+
+	// tests/contracts/storage.algo.ts:173
+	// this.largeStaticArrayInBox.value[123] = 456
+	byte 0x6c617267655374617469634172726179496e426f78 // "largeStaticArrayInBox"
+	int 246
+	byte 0x01c8
+	box_replace
+
+	// tests/contracts/storage.algo.ts:175
+	// return this.largeStaticArrayInBox.value[123];
+	byte 0x6c617267655374617469634172726179496e426f78 // "largeStaticArrayInBox"
+	int 246
+	int 2
+	box_extract
+	btoi
+	retsub
+
+abi_route_dynamicAccessStaticValueInLargeBox:
+	// The ABI return prefix
+	byte 0x151f7c75
+
+	// i: uint64
+	txna ApplicationArgs 1
+	btoi
+
+	// execute dynamicAccessStaticValueInLargeBox(uint64)uint16
+	callsub dynamicAccessStaticValueInLargeBox
+	itob
+	dup
+	bitlen
+	int 16
+	<=
+	assert
+	extract 6 2
+	concat
+	log
+	int 1
+	return
+
+// dynamicAccessStaticValueInLargeBox(uint64)uint16
+dynamicAccessStaticValueInLargeBox:
+	proto 1 1
+
+	// tests/contracts/storage.algo.ts:179
+	// this.largeStaticArrayInBox.create()
+	byte 0x6c617267655374617469634172726179496e426f78 // "largeStaticArrayInBox"
+	int 8000
+	box_create
+	pop
+
+	// tests/contracts/storage.algo.ts:180
+	// this.largeStaticArrayInBox.value[i] = 456
+	frame_dig -1 // i: uint64
+	int 2
+	* // acc * typeLength
+	byte 0x01c8
+	byte 0x6c617267655374617469634172726179496e426f78 // "largeStaticArrayInBox"
+	cover 2
+	box_replace
+
+	// tests/contracts/storage.algo.ts:184
+	// return a[i];
+	frame_dig -1 // i: uint64
+	int 2
+	* // acc * typeLength
+	int 2
+	byte 0x6c617267655374617469634172726179496e426f78 // "largeStaticArrayInBox"
+	cover 2
+	box_extract
+	btoi
+	retsub
+
 abi_route_createApplication:
 	int 1
 	return
@@ -820,6 +922,8 @@ call_NoOp:
 	method "isOptedIn()bool"
 	method "exGlobal()void"
 	method "exLocal()void"
+	method "accessStaticValueInLargeBox()uint16"
+	method "dynamicAccessStaticValueInLargeBox(uint64)uint16"
 	txna ApplicationArgs 0
-	match abi_route_prefix abi_route_globalKeyPut abi_route_globalKeyGet abi_route_globalKeyDelete abi_route_globalKeyExists abi_route_localKeyPut abi_route_localKeyGet abi_route_localKeyDelete abi_route_localKeyExists abi_route_boxKeyPut abi_route_boxKeyGet abi_route_boxKeyDelete abi_route_boxKeyExists abi_route_globalMapPut abi_route_globalMapGet abi_route_globalMapDelete abi_route_globalMapExists abi_route_localMapPut abi_route_localMapGet abi_route_localMapDelete abi_route_localMapExists abi_route_boxMapPut abi_route_boxMapGet abi_route_boxMapDelete abi_route_boxMapExists abi_route_boxKeyCreate abi_route_boxMapCreate abi_route_boxKeyLength abi_route_boxMapLength abi_route_boxKeyReplace abi_route_boxMapReplace abi_route_boxKeyExtract abi_route_boxMapExtract abi_route_isOptedIn abi_route_exGlobal abi_route_exLocal
+	match abi_route_prefix abi_route_globalKeyPut abi_route_globalKeyGet abi_route_globalKeyDelete abi_route_globalKeyExists abi_route_localKeyPut abi_route_localKeyGet abi_route_localKeyDelete abi_route_localKeyExists abi_route_boxKeyPut abi_route_boxKeyGet abi_route_boxKeyDelete abi_route_boxKeyExists abi_route_globalMapPut abi_route_globalMapGet abi_route_globalMapDelete abi_route_globalMapExists abi_route_localMapPut abi_route_localMapGet abi_route_localMapDelete abi_route_localMapExists abi_route_boxMapPut abi_route_boxMapGet abi_route_boxMapDelete abi_route_boxMapExists abi_route_boxKeyCreate abi_route_boxMapCreate abi_route_boxKeyLength abi_route_boxMapLength abi_route_boxKeyReplace abi_route_boxMapReplace abi_route_boxKeyExtract abi_route_boxMapExtract abi_route_isOptedIn abi_route_exGlobal abi_route_exLocal abi_route_accessStaticValueInLargeBox abi_route_dynamicAccessStaticValueInLargeBox
 	err
\ No newline at end of file
diff --git a/tests/contracts/artifacts/StorageTest.arc32.json b/tests/contracts/artifacts/StorageTest.arc32.json
index 7f9aa5336..2defedd07 100644
--- a/tests/contracts/artifacts/StorageTest.arc32.json
+++ b/tests/contracts/artifacts/StorageTest.arc32.json
@@ -180,6 +180,16 @@
         "no_op": "CALL"
       }
     },
+    "accessStaticValueInLargeBox()uint16": {
+      "call_config": {
+        "no_op": "CALL"
+      }
+    },
+    "dynamicAccessStaticValueInLargeBox(uint64)uint16": {
+      "call_config": {
+        "no_op": "CALL"
+      }
+    },
     "createApplication()void": {
       "call_config": {
         "no_op": "CREATE"
@@ -224,7 +234,7 @@
     }
   },
   "source": {
-    "approval": "#pragma version 9

// This TEAL was generated by TEALScript v0.74.0
// https://github.com/algorandfoundation/TEALScript

// This contract is compliant with and/or implements the following ARCs: [ ARC4 ]

// The following ten lines of TEAL handle initial program flow
// This pattern is used to make it easy for anyone to parse the start of the program and determine if a specific action is allowed
// Here, action refers to the OnComplete in combination with whether the app is being created or called
// Every possible action for this contract is represented in the switch statement
// If the action is not implmented in the contract, its respective branch will be "NOT_IMPLEMENTED" which just contains "err"
txn ApplicationID
!
int 6
*
txn OnCompletion
+
switch call_NoOp NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED create_NoOp NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED

NOT_IMPLEMENTED:
	err

abi_route_prefix:
	// execute prefix()void
	callsub prefix
	int 1
	return

// prefix()void
prefix:
	proto 0 0

	// tests/contracts/storage.algo.ts:24
	// this.boxMapWithPrefix('oo').value = 'bar'
	byte 0x666f6f
	dup
	box_del
	pop
	byte 0x626172 // "bar"
	box_put

	// tests/contracts/storage.algo.ts:25
	// this.globalMapWithPrefix('oo').value = 'bar'
	byte 0x666f6f
	byte 0x626172 // "bar"
	app_global_put

	// tests/contracts/storage.algo.ts:26
	// this.localMapWithPrefix(this.txn.sender, 'oo').value = 'bar'
	txn Sender
	byte 0x666f6f
	byte 0x626172 // "bar"
	app_local_put
	retsub

abi_route_globalKeyPut:
	// execute globalKeyPut()void
	callsub globalKeyPut
	int 1
	return

// globalKeyPut()void
globalKeyPut:
	proto 0 0

	// tests/contracts/storage.algo.ts:30
	// this.globalKey.value = 'bar'
	byte 0x666f6f // "foo"
	byte 0x626172 // "bar"
	app_global_put
	retsub

abi_route_globalKeyGet:
	// execute globalKeyGet()void
	callsub globalKeyGet
	int 1
	return

// globalKeyGet()void
globalKeyGet:
	proto 0 0

	// tests/contracts/storage.algo.ts:34
	// assert(this.globalKey.value === 'bar')
	byte 0x666f6f // "foo"
	app_global_get
	byte 0x626172 // "bar"
	==
	assert
	retsub

abi_route_globalKeyDelete:
	// execute globalKeyDelete()void
	callsub globalKeyDelete
	int 1
	return

// globalKeyDelete()void
globalKeyDelete:
	proto 0 0

	// tests/contracts/storage.algo.ts:38
	// this.globalKey.delete()
	byte 0x666f6f // "foo"
	app_global_del
	retsub

abi_route_globalKeyExists:
	// execute globalKeyExists()void
	callsub globalKeyExists
	int 1
	return

// globalKeyExists()void
globalKeyExists:
	proto 0 0

	// tests/contracts/storage.algo.ts:42
	// assert(this.globalKey.exists)
	txna Applications 0
	byte 0x666f6f // "foo"
	app_global_get_ex
	swap
	pop
	assert
	retsub

abi_route_localKeyPut:
	// a: account
	txna ApplicationArgs 1
	btoi
	txnas Accounts

	// execute localKeyPut(account)void
	callsub localKeyPut
	int 1
	return

// localKeyPut(account)void
localKeyPut:
	proto 1 0

	// tests/contracts/storage.algo.ts:46
	// this.localKey(a).value = 'bar'
	frame_dig -1 // a: Account
	byte 0x666f6f // "foo"
	byte 0x626172 // "bar"
	app_local_put
	retsub

abi_route_localKeyGet:
	// a: account
	txna ApplicationArgs 1
	btoi
	txnas Accounts

	// execute localKeyGet(account)void
	callsub localKeyGet
	int 1
	return

// localKeyGet(account)void
localKeyGet:
	proto 1 0

	// tests/contracts/storage.algo.ts:50
	// assert(this.localKey(a).value === 'bar')
	frame_dig -1 // a: Account
	byte 0x666f6f // "foo"
	app_local_get
	byte 0x626172 // "bar"
	==
	assert
	retsub

abi_route_localKeyDelete:
	// a: account
	txna ApplicationArgs 1
	btoi
	txnas Accounts

	// execute localKeyDelete(account)void
	callsub localKeyDelete
	int 1
	return

// localKeyDelete(account)void
localKeyDelete:
	proto 1 0

	// tests/contracts/storage.algo.ts:54
	// this.localKey(a).delete()
	frame_dig -1 // a: Account
	byte 0x666f6f // "foo"
	app_local_del
	retsub

abi_route_localKeyExists:
	// a: account
	txna ApplicationArgs 1
	btoi
	txnas Accounts

	// execute localKeyExists(account)void
	callsub localKeyExists
	int 1
	return

// localKeyExists(account)void
localKeyExists:
	proto 1 0

	// tests/contracts/storage.algo.ts:58
	// assert(this.localKey(a).exists)
	frame_dig -1 // a: Account
	txna Applications 0
	byte 0x666f6f // "foo"
	app_local_get_ex
	swap
	pop
	assert
	retsub

abi_route_boxKeyPut:
	// execute boxKeyPut()void
	callsub boxKeyPut
	int 1
	return

// boxKeyPut()void
boxKeyPut:
	proto 0 0

	// tests/contracts/storage.algo.ts:62
	// this.boxKey.value = 'bar'
	byte 0x666f6f // "foo"
	byte 0x626172 // "bar"
	box_put
	retsub

abi_route_boxKeyGet:
	// execute boxKeyGet()void
	callsub boxKeyGet
	int 1
	return

// boxKeyGet()void
boxKeyGet:
	proto 0 0

	// tests/contracts/storage.algo.ts:66
	// assert(this.boxKey.value === 'bar')
	byte 0x666f6f // "foo"
	box_get
	assert
	byte 0x626172 // "bar"
	==
	assert
	retsub

abi_route_boxKeyDelete:
	// execute boxKeyDelete()void
	callsub boxKeyDelete
	int 1
	return

// boxKeyDelete()void
boxKeyDelete:
	proto 0 0

	// tests/contracts/storage.algo.ts:70
	// this.boxKey.delete()
	byte 0x666f6f // "foo"
	box_del
	retsub

abi_route_boxKeyExists:
	// execute boxKeyExists()void
	callsub boxKeyExists
	int 1
	return

// boxKeyExists()void
boxKeyExists:
	proto 0 0

	// tests/contracts/storage.algo.ts:74
	// assert(this.boxKey.exists)
	byte 0x666f6f // "foo"
	box_len
	swap
	pop
	assert
	retsub

abi_route_globalMapPut:
	// execute globalMapPut()void
	callsub globalMapPut
	int 1
	return

// globalMapPut()void
globalMapPut:
	proto 0 0

	// tests/contracts/storage.algo.ts:78
	// this.globalMap('foo').value = 'bar'
	byte 0x666f6f // "foo"
	byte 0x626172 // "bar"
	app_global_put
	retsub

abi_route_globalMapGet:
	// execute globalMapGet()void
	callsub globalMapGet
	int 1
	return

// globalMapGet()void
globalMapGet:
	proto 0 0

	// tests/contracts/storage.algo.ts:82
	// assert(this.globalMap('foo').value === 'bar')
	byte 0x666f6f // "foo"
	app_global_get
	byte 0x626172 // "bar"
	==
	assert
	retsub

abi_route_globalMapDelete:
	// execute globalMapDelete()void
	callsub globalMapDelete
	int 1
	return

// globalMapDelete()void
globalMapDelete:
	proto 0 0

	// tests/contracts/storage.algo.ts:86
	// this.globalMap('foo').delete()
	byte 0x666f6f // "foo"
	app_global_del
	retsub

abi_route_globalMapExists:
	// execute globalMapExists()void
	callsub globalMapExists
	int 1
	return

// globalMapExists()void
globalMapExists:
	proto 0 0

	// tests/contracts/storage.algo.ts:90
	// assert(this.globalMap('foo').exists)
	txna Applications 0
	byte 0x666f6f // "foo"
	app_global_get_ex
	swap
	pop
	assert
	retsub

abi_route_localMapPut:
	// a: account
	txna ApplicationArgs 1
	btoi
	txnas Accounts

	// execute localMapPut(account)void
	callsub localMapPut
	int 1
	return

// localMapPut(account)void
localMapPut:
	proto 1 0

	// tests/contracts/storage.algo.ts:94
	// this.localMap(a, 'foo').value = 'bar'
	frame_dig -1 // a: Account
	byte 0x666f6f // "foo"
	byte 0x626172 // "bar"
	app_local_put
	retsub

abi_route_localMapGet:
	// a: account
	txna ApplicationArgs 1
	btoi
	txnas Accounts

	// execute localMapGet(account)void
	callsub localMapGet
	int 1
	return

// localMapGet(account)void
localMapGet:
	proto 1 0

	// tests/contracts/storage.algo.ts:98
	// assert(this.localMap(a, 'foo').value === 'bar')
	frame_dig -1 // a: Account
	byte 0x666f6f // "foo"
	app_local_get
	byte 0x626172 // "bar"
	==
	assert
	retsub

abi_route_localMapDelete:
	// a: account
	txna ApplicationArgs 1
	btoi
	txnas Accounts

	// execute localMapDelete(account)void
	callsub localMapDelete
	int 1
	return

// localMapDelete(account)void
localMapDelete:
	proto 1 0

	// tests/contracts/storage.algo.ts:102
	// this.localMap(a, 'foo').delete()
	frame_dig -1 // a: Account
	byte 0x666f6f // "foo"
	app_local_del
	retsub

abi_route_localMapExists:
	// a: account
	txna ApplicationArgs 1
	btoi
	txnas Accounts

	// execute localMapExists(account)void
	callsub localMapExists
	int 1
	return

// localMapExists(account)void
localMapExists:
	proto 1 0

	// tests/contracts/storage.algo.ts:106
	// assert(this.localMap(a, 'foo').exists)
	frame_dig -1 // a: Account
	txna Applications 0
	byte 0x666f6f // "foo"
	app_local_get_ex
	swap
	pop
	assert
	retsub

abi_route_boxMapPut:
	// execute boxMapPut()void
	callsub boxMapPut
	int 1
	return

// boxMapPut()void
boxMapPut:
	proto 0 0

	// tests/contracts/storage.algo.ts:110
	// this.boxMap('foo').value = 'bar'
	byte 0x666f6f // "foo"
	byte 0x626172 // "bar"
	box_put
	retsub

abi_route_boxMapGet:
	// execute boxMapGet()void
	callsub boxMapGet
	int 1
	return

// boxMapGet()void
boxMapGet:
	proto 0 0

	// tests/contracts/storage.algo.ts:114
	// assert(this.boxMap('foo').value === 'bar')
	byte 0x666f6f // "foo"
	box_get
	assert
	byte 0x626172 // "bar"
	==
	assert
	retsub

abi_route_boxMapDelete:
	// execute boxMapDelete()void
	callsub boxMapDelete
	int 1
	return

// boxMapDelete()void
boxMapDelete:
	proto 0 0

	// tests/contracts/storage.algo.ts:118
	// this.boxMap('foo').delete()
	byte 0x666f6f // "foo"
	box_del
	retsub

abi_route_boxMapExists:
	// execute boxMapExists()void
	callsub boxMapExists
	int 1
	return

// boxMapExists()void
boxMapExists:
	proto 0 0

	// tests/contracts/storage.algo.ts:122
	// assert(this.boxMap('foo').exists)
	byte 0x666f6f // "foo"
	box_len
	swap
	pop
	assert
	retsub

abi_route_boxKeyCreate:
	// execute boxKeyCreate()void
	callsub boxKeyCreate
	int 1
	return

// boxKeyCreate()void
boxKeyCreate:
	proto 0 0

	// tests/contracts/storage.algo.ts:126
	// this.boxKey.create(1024)
	byte 0x666f6f // "foo"
	int 1024
	box_create
	retsub

abi_route_boxMapCreate:
	// execute boxMapCreate()void
	callsub boxMapCreate
	int 1
	return

// boxMapCreate()void
boxMapCreate:
	proto 0 0

	// tests/contracts/storage.algo.ts:130
	// this.boxMap('bar').create(1024)
	byte 0x626172 // "bar"
	int 1024
	box_create
	retsub

abi_route_boxKeyLength:
	// The ABI return prefix
	byte 0x151f7c75

	// execute boxKeyLength()uint64
	callsub boxKeyLength
	itob
	concat
	log
	int 1
	return

// boxKeyLength()uint64
boxKeyLength:
	proto 0 1

	// tests/contracts/storage.algo.ts:134
	// return this.boxKey.size;
	byte 0x666f6f // "foo"
	box_len
	assert
	retsub

abi_route_boxMapLength:
	// The ABI return prefix
	byte 0x151f7c75

	// execute boxMapLength()uint64
	callsub boxMapLength
	itob
	concat
	log
	int 1
	return

// boxMapLength()uint64
boxMapLength:
	proto 0 1

	// tests/contracts/storage.algo.ts:138
	// return this.boxMap('bar').size;
	byte 0x626172 // "bar"
	box_len
	assert
	retsub

abi_route_boxKeyReplace:
	// execute boxKeyReplace()void
	callsub boxKeyReplace
	int 1
	return

// boxKeyReplace()void
boxKeyReplace:
	proto 0 0

	// tests/contracts/storage.algo.ts:142
	// this.boxKey.replace(0, 'abc')
	byte 0x666f6f // "foo"
	int 0
	byte 0x616263 // "abc"
	box_replace
	retsub

abi_route_boxMapReplace:
	// execute boxMapReplace()void
	callsub boxMapReplace
	int 1
	return

// boxMapReplace()void
boxMapReplace:
	proto 0 0

	// tests/contracts/storage.algo.ts:146
	// this.boxMap('bar').replace(0, 'abc')
	byte 0x626172 // "bar"
	int 0
	byte 0x616263 // "abc"
	box_replace
	retsub

abi_route_boxKeyExtract:
	// The ABI return prefix
	byte 0x151f7c75

	// execute boxKeyExtract()string
	callsub boxKeyExtract
	dup
	len
	itob
	extract 6 2
	swap
	concat
	concat
	log
	int 1
	return

// boxKeyExtract()string
boxKeyExtract:
	proto 0 1

	// tests/contracts/storage.algo.ts:150
	// return this.boxKey.extract(0, 3);
	byte 0x666f6f // "foo"
	int 0
	int 3
	box_extract
	retsub

abi_route_boxMapExtract:
	// The ABI return prefix
	byte 0x151f7c75

	// execute boxMapExtract()string
	callsub boxMapExtract
	dup
	len
	itob
	extract 6 2
	swap
	concat
	concat
	log
	int 1
	return

// boxMapExtract()string
boxMapExtract:
	proto 0 1

	// tests/contracts/storage.algo.ts:154
	// return this.boxMap('bar').extract(0, 3);
	byte 0x626172 // "bar"
	int 0
	int 3
	box_extract
	retsub

abi_route_isOptedIn:
	// The ABI return prefix
	byte 0x151f7c75

	// execute isOptedIn()bool
	callsub isOptedIn
	byte 0x00
	int 0
	uncover 2
	setbit
	concat
	log
	int 1
	return

// isOptedIn()bool
isOptedIn:
	proto 0 1

	// tests/contracts/storage.algo.ts:158
	// return this.txn.sender.isOptedInToApp(this.app);
	txn Sender
	txna Applications 0
	app_opted_in
	retsub

abi_route_exGlobal:
	// execute exGlobal()void
	callsub exGlobal
	int 1
	return

// exGlobal()void
exGlobal:
	proto 0 0

	// tests/contracts/storage.algo.ts:162
	// log(this.app.globalState('foo') as bytes)
	txna Applications 0
	byte 0x666f6f // "foo"
	app_global_get_ex
	assert
	log
	retsub

abi_route_exLocal:
	// execute exLocal()void
	callsub exLocal
	int 1
	return

// exLocal()void
exLocal:
	proto 0 0

	// tests/contracts/storage.algo.ts:166
	// log(this.app.localState(this.txn.sender, 'foo') as bytes)
	txn Sender
	txna Applications 0
	byte 0x666f6f // "foo"
	app_local_get_ex
	assert
	log
	retsub

abi_route_createApplication:
	int 1
	return

create_NoOp:
	method "createApplication()void"
	txna ApplicationArgs 0
	match abi_route_createApplication
	err

call_NoOp:
	method "prefix()void"
	method "globalKeyPut()void"
	method "globalKeyGet()void"
	method "globalKeyDelete()void"
	method "globalKeyExists()void"
	method "localKeyPut(account)void"
	method "localKeyGet(account)void"
	method "localKeyDelete(account)void"
	method "localKeyExists(account)void"
	method "boxKeyPut()void"
	method "boxKeyGet()void"
	method "boxKeyDelete()void"
	method "boxKeyExists()void"
	method "globalMapPut()void"
	method "globalMapGet()void"
	method "globalMapDelete()void"
	method "globalMapExists()void"
	method "localMapPut(account)void"
	method "localMapGet(account)void"
	method "localMapDelete(account)void"
	method "localMapExists(account)void"
	method "boxMapPut()void"
	method "boxMapGet()void"
	method "boxMapDelete()void"
	method "boxMapExists()void"
	method "boxKeyCreate()void"
	method "boxMapCreate()void"
	method "boxKeyLength()uint64"
	method "boxMapLength()uint64"
	method "boxKeyReplace()void"
	method "boxMapReplace()void"
	method "boxKeyExtract()string"
	method "boxMapExtract()string"
	method "isOptedIn()bool"
	method "exGlobal()void"
	method "exLocal()void"
	txna ApplicationArgs 0
	match abi_route_prefix abi_route_globalKeyPut abi_route_globalKeyGet abi_route_globalKeyDelete abi_route_globalKeyExists abi_route_localKeyPut abi_route_localKeyGet abi_route_localKeyDelete abi_route_localKeyExists abi_route_boxKeyPut abi_route_boxKeyGet abi_route_boxKeyDelete abi_route_boxKeyExists abi_route_globalMapPut abi_route_globalMapGet abi_route_globalMapDelete abi_route_globalMapExists abi_route_localMapPut abi_route_localMapGet abi_route_localMapDelete abi_route_localMapExists abi_route_boxMapPut abi_route_boxMapGet abi_route_boxMapDelete abi_route_boxMapExists abi_route_boxKeyCreate abi_route_boxMapCreate abi_route_boxKeyLength abi_route_boxMapLength abi_route_boxKeyReplace abi_route_boxMapReplace abi_route_boxKeyExtract abi_route_boxMapExtract abi_route_isOptedIn abi_route_exGlobal abi_route_exLocal
	err",
+    "approval": "#pragma version 9

// This TEAL was generated by TEALScript v0.74.0
// https://github.com/algorandfoundation/TEALScript

// This contract is compliant with and/or implements the following ARCs: [ ARC4 ]

// The following ten lines of TEAL handle initial program flow
// This pattern is used to make it easy for anyone to parse the start of the program and determine if a specific action is allowed
// Here, action refers to the OnComplete in combination with whether the app is being created or called
// Every possible action for this contract is represented in the switch statement
// If the action is not implmented in the contract, its respective branch will be "NOT_IMPLEMENTED" which just contains "err"
txn ApplicationID
!
int 6
*
txn OnCompletion
+
switch call_NoOp NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED create_NoOp NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED NOT_IMPLEMENTED

NOT_IMPLEMENTED:
	err

abi_route_prefix:
	// execute prefix()void
	callsub prefix
	int 1
	return

// prefix()void
prefix:
	proto 0 0

	// tests/contracts/storage.algo.ts:26
	// this.boxMapWithPrefix('oo').value = 'bar'
	byte 0x666f6f
	dup
	box_del
	pop
	byte 0x626172 // "bar"
	box_put

	// tests/contracts/storage.algo.ts:27
	// this.globalMapWithPrefix('oo').value = 'bar'
	byte 0x666f6f
	byte 0x626172 // "bar"
	app_global_put

	// tests/contracts/storage.algo.ts:28
	// this.localMapWithPrefix(this.txn.sender, 'oo').value = 'bar'
	txn Sender
	byte 0x666f6f
	byte 0x626172 // "bar"
	app_local_put
	retsub

abi_route_globalKeyPut:
	// execute globalKeyPut()void
	callsub globalKeyPut
	int 1
	return

// globalKeyPut()void
globalKeyPut:
	proto 0 0

	// tests/contracts/storage.algo.ts:32
	// this.globalKey.value = 'bar'
	byte 0x666f6f // "foo"
	byte 0x626172 // "bar"
	app_global_put
	retsub

abi_route_globalKeyGet:
	// execute globalKeyGet()void
	callsub globalKeyGet
	int 1
	return

// globalKeyGet()void
globalKeyGet:
	proto 0 0

	// tests/contracts/storage.algo.ts:36
	// assert(this.globalKey.value === 'bar')
	byte 0x666f6f // "foo"
	app_global_get
	byte 0x626172 // "bar"
	==
	assert
	retsub

abi_route_globalKeyDelete:
	// execute globalKeyDelete()void
	callsub globalKeyDelete
	int 1
	return

// globalKeyDelete()void
globalKeyDelete:
	proto 0 0

	// tests/contracts/storage.algo.ts:40
	// this.globalKey.delete()
	byte 0x666f6f // "foo"
	app_global_del
	retsub

abi_route_globalKeyExists:
	// execute globalKeyExists()void
	callsub globalKeyExists
	int 1
	return

// globalKeyExists()void
globalKeyExists:
	proto 0 0

	// tests/contracts/storage.algo.ts:44
	// assert(this.globalKey.exists)
	txna Applications 0
	byte 0x666f6f // "foo"
	app_global_get_ex
	swap
	pop
	assert
	retsub

abi_route_localKeyPut:
	// a: account
	txna ApplicationArgs 1
	btoi
	txnas Accounts

	// execute localKeyPut(account)void
	callsub localKeyPut
	int 1
	return

// localKeyPut(account)void
localKeyPut:
	proto 1 0

	// tests/contracts/storage.algo.ts:48
	// this.localKey(a).value = 'bar'
	frame_dig -1 // a: Account
	byte 0x666f6f // "foo"
	byte 0x626172 // "bar"
	app_local_put
	retsub

abi_route_localKeyGet:
	// a: account
	txna ApplicationArgs 1
	btoi
	txnas Accounts

	// execute localKeyGet(account)void
	callsub localKeyGet
	int 1
	return

// localKeyGet(account)void
localKeyGet:
	proto 1 0

	// tests/contracts/storage.algo.ts:52
	// assert(this.localKey(a).value === 'bar')
	frame_dig -1 // a: Account
	byte 0x666f6f // "foo"
	app_local_get
	byte 0x626172 // "bar"
	==
	assert
	retsub

abi_route_localKeyDelete:
	// a: account
	txna ApplicationArgs 1
	btoi
	txnas Accounts

	// execute localKeyDelete(account)void
	callsub localKeyDelete
	int 1
	return

// localKeyDelete(account)void
localKeyDelete:
	proto 1 0

	// tests/contracts/storage.algo.ts:56
	// this.localKey(a).delete()
	frame_dig -1 // a: Account
	byte 0x666f6f // "foo"
	app_local_del
	retsub

abi_route_localKeyExists:
	// a: account
	txna ApplicationArgs 1
	btoi
	txnas Accounts

	// execute localKeyExists(account)void
	callsub localKeyExists
	int 1
	return

// localKeyExists(account)void
localKeyExists:
	proto 1 0

	// tests/contracts/storage.algo.ts:60
	// assert(this.localKey(a).exists)
	frame_dig -1 // a: Account
	txna Applications 0
	byte 0x666f6f // "foo"
	app_local_get_ex
	swap
	pop
	assert
	retsub

abi_route_boxKeyPut:
	// execute boxKeyPut()void
	callsub boxKeyPut
	int 1
	return

// boxKeyPut()void
boxKeyPut:
	proto 0 0

	// tests/contracts/storage.algo.ts:64
	// this.boxKey.value = 'bar'
	byte 0x666f6f // "foo"
	byte 0x626172 // "bar"
	box_put
	retsub

abi_route_boxKeyGet:
	// execute boxKeyGet()void
	callsub boxKeyGet
	int 1
	return

// boxKeyGet()void
boxKeyGet:
	proto 0 0

	// tests/contracts/storage.algo.ts:68
	// assert(this.boxKey.value === 'bar')
	byte 0x666f6f // "foo"
	box_get
	assert
	byte 0x626172 // "bar"
	==
	assert
	retsub

abi_route_boxKeyDelete:
	// execute boxKeyDelete()void
	callsub boxKeyDelete
	int 1
	return

// boxKeyDelete()void
boxKeyDelete:
	proto 0 0

	// tests/contracts/storage.algo.ts:72
	// this.boxKey.delete()
	byte 0x666f6f // "foo"
	box_del
	retsub

abi_route_boxKeyExists:
	// execute boxKeyExists()void
	callsub boxKeyExists
	int 1
	return

// boxKeyExists()void
boxKeyExists:
	proto 0 0

	// tests/contracts/storage.algo.ts:76
	// assert(this.boxKey.exists)
	byte 0x666f6f // "foo"
	box_len
	swap
	pop
	assert
	retsub

abi_route_globalMapPut:
	// execute globalMapPut()void
	callsub globalMapPut
	int 1
	return

// globalMapPut()void
globalMapPut:
	proto 0 0

	// tests/contracts/storage.algo.ts:80
	// this.globalMap('foo').value = 'bar'
	byte 0x666f6f // "foo"
	byte 0x626172 // "bar"
	app_global_put
	retsub

abi_route_globalMapGet:
	// execute globalMapGet()void
	callsub globalMapGet
	int 1
	return

// globalMapGet()void
globalMapGet:
	proto 0 0

	// tests/contracts/storage.algo.ts:84
	// assert(this.globalMap('foo').value === 'bar')
	byte 0x666f6f // "foo"
	app_global_get
	byte 0x626172 // "bar"
	==
	assert
	retsub

abi_route_globalMapDelete:
	// execute globalMapDelete()void
	callsub globalMapDelete
	int 1
	return

// globalMapDelete()void
globalMapDelete:
	proto 0 0

	// tests/contracts/storage.algo.ts:88
	// this.globalMap('foo').delete()
	byte 0x666f6f // "foo"
	app_global_del
	retsub

abi_route_globalMapExists:
	// execute globalMapExists()void
	callsub globalMapExists
	int 1
	return

// globalMapExists()void
globalMapExists:
	proto 0 0

	// tests/contracts/storage.algo.ts:92
	// assert(this.globalMap('foo').exists)
	txna Applications 0
	byte 0x666f6f // "foo"
	app_global_get_ex
	swap
	pop
	assert
	retsub

abi_route_localMapPut:
	// a: account
	txna ApplicationArgs 1
	btoi
	txnas Accounts

	// execute localMapPut(account)void
	callsub localMapPut
	int 1
	return

// localMapPut(account)void
localMapPut:
	proto 1 0

	// tests/contracts/storage.algo.ts:96
	// this.localMap(a, 'foo').value = 'bar'
	frame_dig -1 // a: Account
	byte 0x666f6f // "foo"
	byte 0x626172 // "bar"
	app_local_put
	retsub

abi_route_localMapGet:
	// a: account
	txna ApplicationArgs 1
	btoi
	txnas Accounts

	// execute localMapGet(account)void
	callsub localMapGet
	int 1
	return

// localMapGet(account)void
localMapGet:
	proto 1 0

	// tests/contracts/storage.algo.ts:100
	// assert(this.localMap(a, 'foo').value === 'bar')
	frame_dig -1 // a: Account
	byte 0x666f6f // "foo"
	app_local_get
	byte 0x626172 // "bar"
	==
	assert
	retsub

abi_route_localMapDelete:
	// a: account
	txna ApplicationArgs 1
	btoi
	txnas Accounts

	// execute localMapDelete(account)void
	callsub localMapDelete
	int 1
	return

// localMapDelete(account)void
localMapDelete:
	proto 1 0

	// tests/contracts/storage.algo.ts:104
	// this.localMap(a, 'foo').delete()
	frame_dig -1 // a: Account
	byte 0x666f6f // "foo"
	app_local_del
	retsub

abi_route_localMapExists:
	// a: account
	txna ApplicationArgs 1
	btoi
	txnas Accounts

	// execute localMapExists(account)void
	callsub localMapExists
	int 1
	return

// localMapExists(account)void
localMapExists:
	proto 1 0

	// tests/contracts/storage.algo.ts:108
	// assert(this.localMap(a, 'foo').exists)
	frame_dig -1 // a: Account
	txna Applications 0
	byte 0x666f6f // "foo"
	app_local_get_ex
	swap
	pop
	assert
	retsub

abi_route_boxMapPut:
	// execute boxMapPut()void
	callsub boxMapPut
	int 1
	return

// boxMapPut()void
boxMapPut:
	proto 0 0

	// tests/contracts/storage.algo.ts:112
	// this.boxMap('foo').value = 'bar'
	byte 0x666f6f // "foo"
	byte 0x626172 // "bar"
	box_put
	retsub

abi_route_boxMapGet:
	// execute boxMapGet()void
	callsub boxMapGet
	int 1
	return

// boxMapGet()void
boxMapGet:
	proto 0 0

	// tests/contracts/storage.algo.ts:116
	// assert(this.boxMap('foo').value === 'bar')
	byte 0x666f6f // "foo"
	box_get
	assert
	byte 0x626172 // "bar"
	==
	assert
	retsub

abi_route_boxMapDelete:
	// execute boxMapDelete()void
	callsub boxMapDelete
	int 1
	return

// boxMapDelete()void
boxMapDelete:
	proto 0 0

	// tests/contracts/storage.algo.ts:120
	// this.boxMap('foo').delete()
	byte 0x666f6f // "foo"
	box_del
	retsub

abi_route_boxMapExists:
	// execute boxMapExists()void
	callsub boxMapExists
	int 1
	return

// boxMapExists()void
boxMapExists:
	proto 0 0

	// tests/contracts/storage.algo.ts:124
	// assert(this.boxMap('foo').exists)
	byte 0x666f6f // "foo"
	box_len
	swap
	pop
	assert
	retsub

abi_route_boxKeyCreate:
	// execute boxKeyCreate()void
	callsub boxKeyCreate
	int 1
	return

// boxKeyCreate()void
boxKeyCreate:
	proto 0 0

	// tests/contracts/storage.algo.ts:128
	// this.boxKey.create(1024)
	byte 0x666f6f // "foo"
	int 1024
	box_create
	pop
	retsub

abi_route_boxMapCreate:
	// execute boxMapCreate()void
	callsub boxMapCreate
	int 1
	return

// boxMapCreate()void
boxMapCreate:
	proto 0 0

	// tests/contracts/storage.algo.ts:132
	// this.boxMap('bar').create(1024)
	byte 0x626172 // "bar"
	int 1024
	box_create
	pop
	retsub

abi_route_boxKeyLength:
	// The ABI return prefix
	byte 0x151f7c75

	// execute boxKeyLength()uint64
	callsub boxKeyLength
	itob
	concat
	log
	int 1
	return

// boxKeyLength()uint64
boxKeyLength:
	proto 0 1

	// tests/contracts/storage.algo.ts:136
	// return this.boxKey.size;
	byte 0x666f6f // "foo"
	box_len
	assert
	retsub

abi_route_boxMapLength:
	// The ABI return prefix
	byte 0x151f7c75

	// execute boxMapLength()uint64
	callsub boxMapLength
	itob
	concat
	log
	int 1
	return

// boxMapLength()uint64
boxMapLength:
	proto 0 1

	// tests/contracts/storage.algo.ts:140
	// return this.boxMap('bar').size;
	byte 0x626172 // "bar"
	box_len
	assert
	retsub

abi_route_boxKeyReplace:
	// execute boxKeyReplace()void
	callsub boxKeyReplace
	int 1
	return

// boxKeyReplace()void
boxKeyReplace:
	proto 0 0

	// tests/contracts/storage.algo.ts:144
	// this.boxKey.replace(0, 'abc')
	byte 0x666f6f // "foo"
	int 0
	byte 0x616263 // "abc"
	box_replace
	retsub

abi_route_boxMapReplace:
	// execute boxMapReplace()void
	callsub boxMapReplace
	int 1
	return

// boxMapReplace()void
boxMapReplace:
	proto 0 0

	// tests/contracts/storage.algo.ts:148
	// this.boxMap('bar').replace(0, 'abc')
	byte 0x626172 // "bar"
	int 0
	byte 0x616263 // "abc"
	box_replace
	retsub

abi_route_boxKeyExtract:
	// The ABI return prefix
	byte 0x151f7c75

	// execute boxKeyExtract()string
	callsub boxKeyExtract
	dup
	len
	itob
	extract 6 2
	swap
	concat
	concat
	log
	int 1
	return

// boxKeyExtract()string
boxKeyExtract:
	proto 0 1

	// tests/contracts/storage.algo.ts:152
	// return this.boxKey.extract(0, 3);
	byte 0x666f6f // "foo"
	int 0
	int 3
	box_extract
	retsub

abi_route_boxMapExtract:
	// The ABI return prefix
	byte 0x151f7c75

	// execute boxMapExtract()string
	callsub boxMapExtract
	dup
	len
	itob
	extract 6 2
	swap
	concat
	concat
	log
	int 1
	return

// boxMapExtract()string
boxMapExtract:
	proto 0 1

	// tests/contracts/storage.algo.ts:156
	// return this.boxMap('bar').extract(0, 3);
	byte 0x626172 // "bar"
	int 0
	int 3
	box_extract
	retsub

abi_route_isOptedIn:
	// The ABI return prefix
	byte 0x151f7c75

	// execute isOptedIn()bool
	callsub isOptedIn
	byte 0x00
	int 0
	uncover 2
	setbit
	concat
	log
	int 1
	return

// isOptedIn()bool
isOptedIn:
	proto 0 1

	// tests/contracts/storage.algo.ts:160
	// return this.txn.sender.isOptedInToApp(this.app);
	txn Sender
	txna Applications 0
	app_opted_in
	retsub

abi_route_exGlobal:
	// execute exGlobal()void
	callsub exGlobal
	int 1
	return

// exGlobal()void
exGlobal:
	proto 0 0

	// tests/contracts/storage.algo.ts:164
	// log(this.app.globalState('foo') as bytes)
	txna Applications 0
	byte 0x666f6f // "foo"
	app_global_get_ex
	assert
	log
	retsub

abi_route_exLocal:
	// execute exLocal()void
	callsub exLocal
	int 1
	return

// exLocal()void
exLocal:
	proto 0 0

	// tests/contracts/storage.algo.ts:168
	// log(this.app.localState(this.txn.sender, 'foo') as bytes)
	txn Sender
	txna Applications 0
	byte 0x666f6f // "foo"
	app_local_get_ex
	assert
	log
	retsub

abi_route_accessStaticValueInLargeBox:
	// The ABI return prefix
	byte 0x151f7c75

	// execute accessStaticValueInLargeBox()uint16
	callsub accessStaticValueInLargeBox
	itob
	dup
	bitlen
	int 16
	<=
	assert
	extract 6 2
	concat
	log
	int 1
	return

// accessStaticValueInLargeBox()uint16
accessStaticValueInLargeBox:
	proto 0 1

	// tests/contracts/storage.algo.ts:172
	// this.largeStaticArrayInBox.create()
	byte 0x6c617267655374617469634172726179496e426f78 // "largeStaticArrayInBox"
	int 8000
	box_create
	pop

	// tests/contracts/storage.algo.ts:173
	// this.largeStaticArrayInBox.value[123] = 456
	byte 0x6c617267655374617469634172726179496e426f78 // "largeStaticArrayInBox"
	int 246
	byte 0x01c8
	box_replace

	// tests/contracts/storage.algo.ts:175
	// return this.largeStaticArrayInBox.value[123];
	byte 0x6c617267655374617469634172726179496e426f78 // "largeStaticArrayInBox"
	int 246
	int 2
	box_extract
	btoi
	retsub

abi_route_dynamicAccessStaticValueInLargeBox:
	// The ABI return prefix
	byte 0x151f7c75

	// i: uint64
	txna ApplicationArgs 1
	btoi

	// execute dynamicAccessStaticValueInLargeBox(uint64)uint16
	callsub dynamicAccessStaticValueInLargeBox
	itob
	dup
	bitlen
	int 16
	<=
	assert
	extract 6 2
	concat
	log
	int 1
	return

// dynamicAccessStaticValueInLargeBox(uint64)uint16
dynamicAccessStaticValueInLargeBox:
	proto 1 1

	// tests/contracts/storage.algo.ts:179
	// this.largeStaticArrayInBox.create()
	byte 0x6c617267655374617469634172726179496e426f78 // "largeStaticArrayInBox"
	int 8000
	box_create
	pop

	// tests/contracts/storage.algo.ts:180
	// this.largeStaticArrayInBox.value[i] = 456
	frame_dig -1 // i: uint64
	int 2
	* // acc * typeLength
	byte 0x01c8
	byte 0x6c617267655374617469634172726179496e426f78 // "largeStaticArrayInBox"
	cover 2
	box_replace

	// tests/contracts/storage.algo.ts:184
	// return a[i];
	frame_dig -1 // i: uint64
	int 2
	* // acc * typeLength
	int 2
	byte 0x6c617267655374617469634172726179496e426f78 // "largeStaticArrayInBox"
	cover 2
	box_extract
	btoi
	retsub

abi_route_createApplication:
	int 1
	return

create_NoOp:
	method "createApplication()void"
	txna ApplicationArgs 0
	match abi_route_createApplication
	err

call_NoOp:
	method "prefix()void"
	method "globalKeyPut()void"
	method "globalKeyGet()void"
	method "globalKeyDelete()void"
	method "globalKeyExists()void"
	method "localKeyPut(account)void"
	method "localKeyGet(account)void"
	method "localKeyDelete(account)void"
	method "localKeyExists(account)void"
	method "boxKeyPut()void"
	method "boxKeyGet()void"
	method "boxKeyDelete()void"
	method "boxKeyExists()void"
	method "globalMapPut()void"
	method "globalMapGet()void"
	method "globalMapDelete()void"
	method "globalMapExists()void"
	method "localMapPut(account)void"
	method "localMapGet(account)void"
	method "localMapDelete(account)void"
	method "localMapExists(account)void"
	method "boxMapPut()void"
	method "boxMapGet()void"
	method "boxMapDelete()void"
	method "boxMapExists()void"
	method "boxKeyCreate()void"
	method "boxMapCreate()void"
	method "boxKeyLength()uint64"
	method "boxMapLength()uint64"
	method "boxKeyReplace()void"
	method "boxMapReplace()void"
	method "boxKeyExtract()string"
	method "boxMapExtract()string"
	method "isOptedIn()bool"
	method "exGlobal()void"
	method "exLocal()void"
	method "accessStaticValueInLargeBox()uint16"
	method "dynamicAccessStaticValueInLargeBox(uint64)uint16"
	txna ApplicationArgs 0
	match abi_route_prefix abi_route_globalKeyPut abi_route_globalKeyGet abi_route_globalKeyDelete abi_route_globalKeyExists abi_route_localKeyPut abi_route_localKeyGet abi_route_localKeyDelete abi_route_localKeyExists abi_route_boxKeyPut abi_route_boxKeyGet abi_route_boxKeyDelete abi_route_boxKeyExists abi_route_globalMapPut abi_route_globalMapGet abi_route_globalMapDelete abi_route_globalMapExists abi_route_localMapPut abi_route_localMapGet abi_route_localMapDelete abi_route_localMapExists abi_route_boxMapPut abi_route_boxMapGet abi_route_boxMapDelete abi_route_boxMapExists abi_route_boxKeyCreate abi_route_boxMapCreate abi_route_boxKeyLength abi_route_boxMapLength abi_route_boxKeyReplace abi_route_boxMapReplace abi_route_boxKeyExtract abi_route_boxMapExtract abi_route_isOptedIn abi_route_exGlobal abi_route_exLocal abi_route_accessStaticValueInLargeBox abi_route_dynamicAccessStaticValueInLargeBox
	err",
     "clear": "I3ByYWdtYSB2ZXJzaW9uIDk="
   },
   "contract": {
@@ -523,6 +533,25 @@
           "type": "void"
         }
       },
+      {
+        "name": "accessStaticValueInLargeBox",
+        "args": [],
+        "returns": {
+          "type": "uint16"
+        }
+      },
+      {
+        "name": "dynamicAccessStaticValueInLargeBox",
+        "args": [
+          {
+            "name": "i",
+            "type": "uint64"
+          }
+        ],
+        "returns": {
+          "type": "uint16"
+        }
+      },
       {
         "name": "createApplication",
         "args": [],
diff --git a/tests/contracts/artifacts/StorageTest.arc4.json b/tests/contracts/artifacts/StorageTest.arc4.json
index cffd4b786..00934abfa 100644
--- a/tests/contracts/artifacts/StorageTest.arc4.json
+++ b/tests/contracts/artifacts/StorageTest.arc4.json
@@ -294,6 +294,25 @@
         "type": "void"
       }
     },
+    {
+      "name": "accessStaticValueInLargeBox",
+      "args": [],
+      "returns": {
+        "type": "uint16"
+      }
+    },
+    {
+      "name": "dynamicAccessStaticValueInLargeBox",
+      "args": [
+        {
+          "name": "i",
+          "type": "uint64"
+        }
+      ],
+      "returns": {
+        "type": "uint16"
+      }
+    },
     {
       "name": "createApplication",
       "args": [],
diff --git a/tests/contracts/storage.algo.ts b/tests/contracts/storage.algo.ts
index e1c7fd770..a0d33ac09 100644
--- a/tests/contracts/storage.algo.ts
+++ b/tests/contracts/storage.algo.ts
@@ -2,6 +2,8 @@ import { Contract } from '../../src/lib/index';
 
 // eslint-disable-next-line no-unused-vars
 class StorageTest extends Contract {
+  largeStaticArrayInBox = BoxKey<StaticArray<uint16, 4000>>();
+
   globalKey = GlobalStateKey<bytes>({ key: 'foo' });
 
   globalMap = GlobalStateMap<bytes, bytes>({ maxKeys: 1, allowPotentialCollisions: true });
@@ -165,4 +167,20 @@ class StorageTest extends Contract {
   exLocal(): void {
     log(this.app.localState(this.txn.sender, 'foo') as bytes);
   }
+
+  accessStaticValueInLargeBox(): uint16 {
+    this.largeStaticArrayInBox.create();
+    this.largeStaticArrayInBox.value[123] = 456;
+
+    return this.largeStaticArrayInBox.value[123];
+  }
+
+  dynamicAccessStaticValueInLargeBox(i: uint64): uint16 {
+    this.largeStaticArrayInBox.create();
+    this.largeStaticArrayInBox.value[i] = 456;
+
+    const a = this.largeStaticArrayInBox.value;
+
+    return a[i];
+  }
 }
diff --git a/tests/storage.test.ts b/tests/storage.test.ts
index b07c5cf81..ca469a6ec 100644
--- a/tests/storage.test.ts
+++ b/tests/storage.test.ts
@@ -229,6 +229,58 @@ describe('Storage', function () {
 
       expect(result.return?.returnValue as string).toEqual('abc');
     });
+
+    test('accessStaticValueInLargeBox', async () => {
+      const box = new Uint8Array(Buffer.from('largeStaticArrayInBox'));
+      await appClient.fundAppAccount({
+        amount: algokit.microAlgos(3310900),
+        sendParams: SUPPRESS_LOG,
+      });
+
+      const result = await appClient.call({
+        method: 'accessStaticValueInLargeBox',
+        methodArgs: [],
+        boxes: [
+          { appIndex: 0, name: box },
+          { appIndex: 0, name: box },
+          { appIndex: 0, name: box },
+          { appIndex: 0, name: box },
+          { appIndex: 0, name: box },
+          { appIndex: 0, name: box },
+          { appIndex: 0, name: box },
+          { appIndex: 0, name: box },
+        ],
+        sendParams: SUPPRESS_LOG,
+      });
+
+      expect(result.return?.returnValue?.valueOf()).toEqual(456n);
+    });
+
+    test('dynamicAccessStaticValueInLargeBox', async () => {
+      const box = new Uint8Array(Buffer.from('largeStaticArrayInBox'));
+      await appClient.fundAppAccount({
+        amount: algokit.microAlgos(3310900),
+        sendParams: SUPPRESS_LOG,
+      });
+
+      const result = await appClient.call({
+        method: 'dynamicAccessStaticValueInLargeBox',
+        methodArgs: [123n],
+        boxes: [
+          { appIndex: 0, name: box },
+          { appIndex: 0, name: box },
+          { appIndex: 0, name: box },
+          { appIndex: 0, name: box },
+          { appIndex: 0, name: box },
+          { appIndex: 0, name: box },
+          { appIndex: 0, name: box },
+          { appIndex: 0, name: box },
+        ],
+        sendParams: SUPPRESS_LOG,
+      });
+
+      expect(result.return?.returnValue?.valueOf()).toEqual(456n);
+    });
   });
 
   describe('Compile Errors', function () {
diff --git a/types/global.d.ts b/types/global.d.ts
index e8ffcfe48..bd2d2f25d 100644
--- a/types/global.d.ts
+++ b/types/global.d.ts
@@ -480,7 +480,7 @@ declare type BoxValue<ValueType> = {
   value: ValueType;
   delete: () => void;
   exists: boolean;
-  create(size: uint64): void;
+  create(size?: uint64): void;
   replace(offset: uint64, value: bytes): void;
   extract(offset: uint64, length: uint64): bytes;
   size: uint64;