added links & improved format