need to make sure this will be handled correctly in the future and need to go through all existing links to repair
need to make sure this will be handled correctly in the future and need to go through all existing links to repair