modify return to include all fields