Update from old xap97 wiki