Safety

Trying to get Scott and Grant good version