Updated code for risk maps - Hung