Incorporate Nick's comment