updated links, changed format