Added more work on calculator