edit with Julie's comments