Add the two first step checking