Add NASA bit and rearrange to be consistent.