several changes and integrations