Moved all blocking stuff to firewall