Added functionality to Questions 2 and 3