second pass for autochecking, need more test