updated to accomodate the new fields