added values in safe function