adjusted safe level
merge
trying to patch bug