Facebook fix & Refactoring Ver. 3.87