Check before conclusion and final tweak

Check before conclusion and final tweak