addressing @lbakken comments