updated with up to date fields