Full edit (8/26)

Full edit