add prev bfi change as per review comments