extra work on fields etc
renamed