replaced some fields