Changed URI's for correct usage...