Full edit (21/26)

Full edit