updates per xtraeme's suggestions