Applied changes from hax