new fields and some corrections