back to 8/4 layout; work on #518