update based on @sblanc feedback