added the rest of the checks