finished implementing official sources