Made few modifications