Updated solutions (now links to pages)