Refactored question 4 and 1