Make the conditions safer