Cleaned UP 2.x Autopop pull request

This looks much betta