Working on more fields