changes based on @jrrideout comments