Some more integeration changes.....