cleaned up, url updated