Revision of 31/08 + Xyrfo's list