Added few modifications