#15 added the rest of the fields