Tweaking how we calculate things in output