Added Basic Checks