Updated some risk prevention - Oisin