Changes to link and added axis class