Add thumb blocking
Fix merge conflicts