Format changes
Save some bytes for 32G devices
Format changes