Modified the pull request by tehhkp