we do 2 checks now when we need to