add additional checks