integrating new changes from link_generator