Updated the risk tools to latest rules