Restructuring; Lang doesn't block render;