updating to include fields