refactored naming
added links