bringing up to 12.0

as well as making safestrap compatible