Cool changes

Good job, these changes can sure help. Thank you for making them. Do you mind if this gets pulled back to my repo too?

(Also this is my first time doing this btw, so I have no idea what is going on, but trying to figure it out, bear with me)