Updated after adding structcheck.