Made changes in accordance with comments.