Debugged for VAF