Use field as source + bug fixes