A little bit of finetuning
field generation ready