Changes to incorporate x2 auth physics systems