fields work almost done
quick simplification