Switched to 16-bit byte-counts
Switched to 17-bit byte counts