Problem 6 and Problem 7 (calculator)- added