Did some more integration stuff