simplify, fix link