Implement Goal 4