Pulling from DarkTechnician's 1.7.2 port