An addition + tweaking

Lots of tweaking!
Added TPAField.