Implement Goal 2