updates per ari's suggestions