added rest of fields