Add everything checking ..