Fixed a small structure padding issue
Update variant 2 based on the variant 1 changes