Safety-checks

Safety Checks 2