mostly dup'd changes made on bcfa - one time