Updated setup to force links