Improve blocking system