#11, and removing dependency on URLs in table