added and removed some fields