trying to fix the FB flow