Improve digital safety mechanisms

Sources