Changed fields to make them make more sense