improved to link right things