More WordPress codex compliant