Added an intial check (let's finish the rest)