Reverted the latest changes to monitor