Assignment 5.4 completed