Full edit (22/26)

Full edit