Making changes to get as many fields as possible