add rest of the fields!