adding functionality to detect blocked state
fixing merge conflict