Added solution to 1.16