added missing fields. still has a problem.