Updated to bring BST check into the agent