Added more to  LinkFunction