added more linking stuff