Full edit (12/26)

Full edit