Mainly updates to safety procedure.