Here uploading my patch and inter-diff for above comment....Please review it.