up date as per pr comments