Adding comment and some modifications