Applying comments from Brian.