added some correction