changes done after found some correction