Added tinie_snipah's changes

In testing on my computer, proved unstable for some reason. Unknown
why, just is