Update for shorter urls and stuff