Long edit (8/24)

Long edit