Edit Extension: 2506