more changes to link structure