prep for safety fix? maybe.