REVISED VERSION FOR COMMENTS ONLY.