further modular updates