Ziqi's first changes to binary.h