Added the rest of the checks