Adding initial checks