Updated per jay's comments