renamed uniq fields. This will not work for dynamically naming of fields.  Forced to move along project