Full edit (25/26)

Full edit