changed the methods for the blocker to make it easier.
Merge branch 'origin/Fix-Launcher'