Refactoring
Authentication FB
Refactoring
Merge