add few check