adjusted variables per @andymcc