Deep edit (7/25)

Deep edit