Fixed and made link-able