Switching back to before FB integration to check this still works