implement a couple ofkirsten's suggestions