update with cheri's suggestions