Changes to link properly