Manual field control
Manual Field control update

still problems with concurrency