reverting to the previous code - i think we need to copy all fields or we end up in confusion.