Add new fields, but leave commented for testing