Changes to BetterPart conflict with changes made to Greys0:master
Other code merged separately