added link resolving