BUgfi post logic changes