state-link improved