added some safe local variable values