refactored link