#113 Uses links wherever possible