Added few new changes