Change SafeAccess/access
merge
Reverting some changes.