update with evz's suggestions