Added solution to 1.8