Added solution for 1.7