all fields added... hopefully