Added some risk grid functionality