Updated uri and stuff