Long edit (6/24)

Long edit