Add extra step with linking