Box 1.7

Revert 1.6