Completed solution 1.4