Link type

Updated and now targeted to master