Replaced link() method with custom makeLink() method