some more changes with double0x10 processing