not sure why this whole chunk is needed, and should I take out the duplicate fields in the existing case ?