Factors fixed; Dealing with unknown fields