added links, refactored