Added back in logic for safe parameter