changed all to direct links in db