Dove fields #3 and #4

Dove fields #3 and #4