Updated to packed bitmaps with headers