Dove fields #1 and #2

Dove fields #1 and #2