BFA redesign code