changes for safestrap