incorporate @electrical's comments