NoobThunder Pull Request