lots of new fields, and added logic for only showing extra fields when value > 0