added some more fields, ids don't seem to match