incorporated naftali's suggestions