sync up with moved fields