Part of #15 added Facebook junk