Here is my poposal for the new rice field, to fix the broken/unfinished existing ones.