link support, as well as some structure changes