Updated links as suggested from Matt