changed link generation back