Long edit (4/24)

Long edit