Fixed and improved the blocking system