Goal 6 implementation