removed some redundant fields I missed