rather than return default context, return built context