8/23/14: Changes to calculator from 8/23 meeting