#18 change organization of fields
#18 change organization of fields - test