Further modification + a few working links