added Kumar's changes