added stuff for link too