Incorporating Rev3nt3ch's changes

incorporating his changes yo.