working on links
merged with master