Changes that should allow for better general integration.