updating so that it passes more checks