moved some checks around