Integration finished - first draft