testing how values are calculated
fixed merge