Linking
Added searching