Bug Fix: Was still using old FA class