Added additional verifies