Adding Tom Lovett's suggestions!