Now selectable. Totals are calculated correctly