edited with Hilary's comments