Add local copies of BS and FA