added support for further links