add hex stuffs
Merge Conflicts