moved some checks