[Issue #208][WIP] Salma removed a link