Last several commits were to fix twitter bug in production