moved links to @data