Task #7 partially implemented