Made chenges suggested by Alex.