updated per jay's comments