Incorporated comments from @danzel.