refactor
added state link + data source text