adjusting to fields added