Added improved solution to Q2