WIP
Use fields
update benchmarks