Improvement to BetterPart from Majiir