both wiki-optimized and 'regular' versions - hopefully final for the core!