Made few more changes.